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

@ -68,7 +68,7 @@ do_terrain(int basey, int basex, int deltay, int deltax, bool fresh)
ch = rnd_terrain();
addch(ch);
}
else ch = mvinch(basey, basex);
else ch = mvinch(basey, basex) & A_CHARTEXT;
curx += deltax;
@ -95,10 +95,10 @@ do_terrain(int basey, int basex, int deltay, int deltax, bool fresh)
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));