Mercurial > hg > early-roguelike

diff srogue/disply.c @ 304:e52a8a7ad4c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix many compiler warnings. There should only be two changes in behavior: arogue7/fight.c, arogue7/fight.c: a to-hit bonus is now correctly applied to characters who are not monks instead of monks who are not empty-handed. urogue/fight.c: fixed an interaction with the "debug" macro that could cause the wrong message to be displayed.
author John "Elwin" Edwards
date Wed, 14 Apr 2021 18:55:33 -0400
parents 94a0d9dd5ce1
children
line wrap: on
line diff
--- a/srogue/disply.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/srogue/disply.c	Wed Apr 14 18:55:33 2021 -0400
@@ -30,7 +30,7 @@
 
 	for (i = 0; i < LINES - 2; i++) {
 		for (j = 0; j < COLS - 1; j++) {
-			ch = mvinch(i,j);
+			ch = mvinch(i,j) & A_CHARTEXT;
 			if (isatrap(ch)) {
 				struct trap *what;
 
@@ -60,7 +60,7 @@
 					it->t_oldch = ch;
 				}
 			}
-			mch = mvwinch(cw, i, j);
+			mch = mvwinch(cw, i, j) & A_CHARTEXT;
 			if (isalpha(mch))
 				ch = mch;
 			mvwaddch(cw, i, j, ch);
@@ -77,7 +77,7 @@
 void
 dispmons(void)
 {
-	reg int ch, y, x;
+	reg int y, x;
 	reg struct thing *it;
 	reg struct linked_list *item;
 
@@ -103,7 +103,7 @@
 	reg char ch;
 
 	if (mvwinch(mw,y,x) == ' ')
-		ch = mvinch(y, x);			/* non-monsters */
+		ch = mvinch(y, x) & A_CHARTEXT;		/* non-monsters */
 	else
 		ch = winch(mw);				/* monsters */
 	return ch;