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

11
srogue/move.c
View file

@ -203,7 +203,7 @@ do_move(int dy, int dx)
mvwaddch(cw, nh.y, nh.x, PLAYER);
hero = nh;
player.t_room = rp;
player.t_oldch = mvinch(hero.y, hero.x);
player.t_oldch = mvinch(hero.y, hero.x) & A_CHARTEXT;
}
/*
@ -263,13 +263,13 @@ light(struct coord *cp)
mit = THINGPTR(item);
if (mit->t_oldch == ' ')
if (!rf_on(rp,ISDARK))
mit->t_oldch = mvinch(y, x);
mit->t_oldch = mvinch(y, x) & A_CHARTEXT;
if (levtype == MAZELEV)
ch = mvinch(y, x);
ch = mvinch(y, x) & A_CHARTEXT;
}
}
if (rf_on(rp,ISDARK)) {
rch = mvwinch(cw, y, x);
rch = mvwinch(cw, y, x) & A_CHARTEXT;
if (isatrap(rch)) {
ch = rch; /* if its a trap */
}
@ -320,7 +320,7 @@ show(int y, int x)
if (ch == 's')
ch = ' '; /* shadows show as a blank */
else
ch = mvinch(y, x); /* hide invisibles */
ch = mvinch(y, x) & A_CHARTEXT; /* hide invisibles */
}
}
}
@ -336,7 +336,6 @@ be_trapped(struct coord *tc, struct thing *th)
{
reg struct trap *trp;
reg int ch, ishero;
struct linked_list *mon;
char stuckee[35], seeit, sayso;
if ((trp = trap_at(tc->y, tc->x)) == NULL)