Mercurial > hg > early-roguelike
diff srogue/chase.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 |
line wrap: on
line diff
--- a/srogue/chase.c Sat Mar 20 22:36:52 2021 -0400 +++ b/srogue/chase.c Wed Apr 14 18:55:33 2021 -0400 @@ -210,7 +210,7 @@ } if (pl_off(ISBLIND)) mvwaddch(cw,th->t_pos.y,th->t_pos.x,th->t_oldch); - sch = mvwinch(cw, ch_ret.y, ch_ret.x); + sch = mvwinch(cw, ch_ret.y, ch_ret.x) & A_CHARTEXT; if (rer != NULL && rf_on(rer,ISDARK) && sch == FLOOR && DISTANCE(ch_ret.y,ch_ret.x,th->t_pos.y,th->t_pos.x) < 3 && pl_off(ISBLIND)) @@ -452,7 +452,8 @@ { if (ep->x == sp->x || ep->y == sp->y) return TRUE; - if (step_ok(mvinch(ep->y,sp->x)) && step_ok(mvinch(sp->y,ep->x))) + if (step_ok(mvinch(ep->y,sp->x) & A_CHARTEXT) && + step_ok(mvinch(sp->y,ep->x) & A_CHARTEXT)) return TRUE; return FALSE; }