Mercurial > hg > early-roguelike

diff rogue4/rooms.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 1b73a8641b37
children
line wrap: on
line diff
--- a/rogue4/rooms.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/rogue4/rooms.c	Wed Apr 14 18:55:33 2021 -0400
@@ -235,7 +235,7 @@
     floor = ((rp->r_flags & ISDARK) && !on(player, ISBLIND)) ? ' ' : FLOOR;
     for (y = rp->r_pos.y + 1; y < rp->r_max.y + rp->r_pos.y - 1; y++)
 	for (x = rp->r_pos.x + 1; x < rp->r_max.x + rp->r_pos.x - 1; x++)
-	    switch (ch = mvinch(y, x))
+	    switch (ch = mvinch(y, x) & A_CHARTEXT)
 	    {
 		case ' ':
 		case TRAP:
@@ -251,6 +251,7 @@
 		     * standout bit
 		     */
 		    if (isupper(toascii(ch)))
+		    {
 			if (on(player, SEEMONST))
 			{
 			    standout();
@@ -270,6 +271,7 @@
                                 msg("couldn't find monster in leave_room at (%d,%d)", y, x);
 #endif
                         }
+		    }
 
 		    addch(floor);
 	    }