Mercurial > hg > early-roguelike
diff xrogue/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 | 2236ef808bcb |
| children | 2f0eb38da609 |
line wrap: on
line diff
--- a/xrogue/sticks.c Sat Mar 20 22:36:52 2021 -0400 +++ b/xrogue/sticks.c Wed Apr 14 18:55:33 2021 -0400 @@ -269,7 +269,7 @@ mvwaddch(mw, y, x, ' '); mvwaddch(mw, tp->t_pos.y, tp->t_pos.x, tp->t_type); if (tp->t_pos.y != y || tp->t_pos.x != x) - 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; /* * check to see if room that creature appears in should * light up @@ -341,7 +341,7 @@ direction->y += hero.y; direction->x += hero.x; - ch = winat(direction->y, direction->x); + ch = winat(direction->y, direction->x) & A_CHARTEXT; if (isalpha(ch)) { strike = *obj; @@ -550,7 +550,7 @@ for(m2=tp->t_pos.y-1 ; m2<=tp->t_pos.y+1 ; m2++) { if (m1 == hero.x && m2 == hero.y) continue; - ch = winat(m2,m1); + ch = winat(m2,m1) & A_CHARTEXT; if (shoot_ok(ch)) { mp.x = m1; /* create it */ mp.y = m2;