nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Silence GCC warnings

Browse Source 
...when compiling with -Wall --pedantic
This commit is contained in:
Pasi Kallinen
2015-03-31 08:36:32 +03:00
parent ec7238ac22
commit f2d97b2d00
8 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/trap.c
View File

@@ -1406,13 +1406,12 @@ struct obj *otmp;
{
struct monst *steed = u.usteed;
int tt;
boolean in_sight, trapkilled, steedhit;
boolean trapkilled, steedhit;
if (!steed || !trap) return 0;
tt = trap->ttyp;
steed->mx = u.ux;
steed->my = u.uy;
in_sight = !Blind;
trapkilled = steedhit = FALSE;
switch (tt) {
@@ -4266,7 +4265,7 @@ boolean trapdoor_only;
boolean *noticed; /* set to true iff hero notices the effect; */
{ /* otherwise left with its previous value intact */
struct trap *t;
boolean ishero = (mon == &youmonst), result;
boolean ishero = (mon == &youmonst);
if (mon == u.usteed) ishero = TRUE;
t = t_at(ishero ? u.ux : mon->mx, ishero ? u.uy : mon->my);
@@ -4281,7 +4280,6 @@ boolean *noticed; /* set to true iff hero notices the effect; */
if (u.utrap) return FALSE; /* already trapped */
*noticed = TRUE;
dotrap(t, FORCETRAP);
result = (u.utrap != 0);
} else {
if (mon->mtrapped) return FALSE; /* already trapped */
/* you notice it if you see the trap close/tremble/whatever
@@ -4290,7 +4288,6 @@ boolean *noticed; /* set to true iff hero notices the effect; */
/* monster will be angered; mintrap doesn't handle that */
wakeup(mon);
++force_mintrap;
result = (mintrap(mon) != 0);
--force_mintrap;
/* mon might now be on the migrating monsters list */
}