Mercurial > hg > early-roguelike
diff srogue/move.c @ 304:e52a8a7ad4c5
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.
| author | John "Elwin" Edwards |
|---|---|
| date | Wed, 14 Apr 2021 18:55:33 -0400 |
| parents | 94a0d9dd5ce1 |
| children |
line wrap: on
line diff
--- a/srogue/move.c Sat Mar 20 22:36:52 2021 -0400 +++ b/srogue/move.c Wed Apr 14 18:55:33 2021 -0400 @@ -203,7 +203,7 @@ 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 @@ 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 @@ 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 @@ { 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)