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.
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

View file

@ -53,9 +53,9 @@ shoot_bolt(struct thing *shooter, coord start, coord dir, bool get_points,
bounces = 0; /* No bounces yet */
nofont(cw);
for (y = 0; y < BOLT_LENGTH && !used; y++) {
ch = winat(pos.y, pos.x);
ch = winat(pos.y, pos.x) & A_CHARTEXT;
spotpos[y].place = pos;
spotpos[y].oldch = mvwinch(cw, pos.y, pos.x);
spotpos[y].oldch = mvwinch(cw, pos.y, pos.x) & A_CHARTEXT;
/* Are we at hero? */
if (ce(pos, hero)) goto at_hero;
@ -70,8 +70,8 @@ shoot_bolt(struct thing *shooter, coord start, coord dir, bool get_points,
dir.x = -dir.x;
}
else {
unsigned char chx = mvinch(pos.y-dir.y, pos.x),
chy = mvinch(pos.y, pos.x-dir.x);
unsigned char chx = mvinch(pos.y-dir.y, pos.x) & A_CHARTEXT,
chy = mvinch(pos.y, pos.x-dir.x) & A_CHARTEXT;
bool anychange = FALSE; /* Did we change anthing */
if (chy == WALL || chy == SECRETDOOR ||