diff srogue/sticks.c @ 304:e52a8a7ad4c5

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 28e22fb35989
line wrap: on
line diff
--- a/srogue/sticks.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/srogue/sticks.c	Wed Apr 14 18:55:33 2021 -0400
@@ -219,7 +219,7 @@
 			y += delta.y;
 			x += delta.x;
 		} while (step_ok(winat(y, x)));
-		if (isalpha(monster = mvwinch(mw, y, x))) {
+		if (isalpha(monster = mvwinch(mw, y, x) & A_CHARTEXT)) {
 			int omonst;
 
 			if (wh != WS_MINVIS)
@@ -271,7 +271,7 @@
 				tp->t_flags |= ISRUN;
 				mvwaddch(mw, y, x, ' ');
 				mvwaddch(mw, tp->t_pos.y, tp->t_pos.x, monster);
-				tp->t_oldch = mvwinch(cw,tp->t_pos.y,tp->t_pos.x);
+				tp->t_oldch = mvwinch(cw,tp->t_pos.y,tp->t_pos.x) & A_CHARTEXT;
 			}
 		}
 	}