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

12
xrogue/n_level.c
View file

@ -100,22 +100,22 @@ new_level(LEVTYPE ltype)
if (vert)
for (j=1; j<cols-1; j++) {
if (top) {
cch = mvinch(i+2, j);
cch = mvinch(i+2, j) & A_CHARTEXT;
mvaddch(lines-6+i, j, cch);
}
else {
cch = mvinch(lines-4-i, j);
cch = mvinch(lines-4-i, j) & A_CHARTEXT;
mvaddch(4-i, j, cch);
}
}
else
for (j=2; j<lines-3; j++) {
if (top) {
cch = mvinch(j, i+1);
cch = mvinch(j, i+1) & A_CHARTEXT;
mvaddch(j, cols-4+i, cch);
}
else {
cch = mvinch(j, cols-2-i);
cch = mvinch(j, cols-2-i) & A_CHARTEXT;
mvaddch(j, 3-i, cch);
}
}
@ -310,7 +310,7 @@ new_level(LEVTYPE ltype)
rnd_pos(&rooms[rm], &tp->t_pos);
} until (cnt++ > 2500 || winat(tp->t_pos.y, tp->t_pos.x) == FLOOR);
mvwaddch(mw, tp->t_pos.y, tp->t_pos.x, tp->t_type);
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;
/*
* If it has a fire, mark it
@ -335,7 +335,7 @@ new_level(LEVTYPE ltype)
nitem = next(item);
tp = THINGPTR(item);
mvwaddch(mw, tp->t_pos.y, tp->t_pos.x, tp->t_type);
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;
/*
* If it has a fire, mark it