warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix many compiler warnings.

Browse source 
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.
This commit is contained in:
John "Elwin" Edwards 2021-04-14 18:55:33 -04:00
parent 6f21b5b88a
commit 6c3cd116ff
122 changed files with 374 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

5
srogue/chase.c
View file

@ -210,7 +210,7 @@ do_chase(struct linked_list *mon)
}
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 @@ diag_ok(struct coord *sp, struct coord *ep)
{
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;
}