Mercurial > hg > early-roguelike

diff xrogue/io.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 f54901b9c39b
children
line wrap: on
line diff
--- a/xrogue/io.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/xrogue/io.c	Wed Apr 14 18:55:33 2021 -0400
@@ -167,8 +167,8 @@
     unsigned char ch;
 
     /* What is here?  Don't check monster window if MONSTOK is set */
-    if (can_on_monst == MONSTOK) ch = mvinch(y, x);
-    else ch = winat(y, x);
+    if (can_on_monst == MONSTOK) ch = mvinch(y, x) & A_CHARTEXT;
+    else ch = winat(y, x) & A_CHARTEXT;
 
     if (can_on_monst == FIGHTOK && isalpha(ch) &&
         (item = find_mons(y, x)) != NULL) {