Mercurial > hg > early-roguelike

diff xrogue/outside.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/outside.c	Sat Mar 20 22:36:52 2021 -0400
+++ b/xrogue/outside.c	Wed Apr 14 18:55:33 2021 -0400
@@ -68,7 +68,7 @@
             ch = rnd_terrain();
             addch(ch);
         }
-        else ch = mvinch(basey, basex);
+        else ch = mvinch(basey, basex) & A_CHARTEXT;
 
         curx += deltax;
 
@@ -95,10 +95,10 @@
             left_pos = curx - deltax;
             top_pos = cury - deltay;
 
-            left = mvinch(cury, left_pos);
-            top_left = mvinch(top_pos, left_pos);
-            top = mvinch(top_pos, curx);
-            top_right = mvinch(top_pos, curx + deltax);
+            left = mvinch(cury, left_pos) & A_CHARTEXT;
+            top_left = mvinch(top_pos, left_pos) & A_CHARTEXT;
+            top = mvinch(top_pos, curx) & A_CHARTEXT;
+            top_right = mvinch(top_pos, curx + deltax) & A_CHARTEXT;
 
             /* Put the piece of terrain on the map */
             mvaddch(cury, curx, get_terrain(left, top_left, top, top_right));