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

Revert "Moved potion.c globals to instance_globals."

Browse Source 
This reverts commit d3c192e5a8.
This commit is contained in:
nhmall
2018-11-23 22:16:54 -05:00
parent 6f3f1caee3
commit 2fb68024fe
15 changed files with 84 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dokick.c
View File

@@ -14,6 +14,8 @@ static NEARDATA const char *gate_str;
/* kickedobj (decl.c) tracks a kicked object until placed or destroyed */
extern boolean notonhead; /* for long worms */
STATIC_DCL void FDECL(kickdmg, (struct monst *, BOOLEAN_P));
STATIC_DCL boolean FDECL(maybe_kick_monster, (struct monst *,
XCHAR_P, XCHAR_P));
@@ -677,7 +679,7 @@ xchar x, y;
if (mon->isshk && kickedobj->where == OBJ_MINVENT
&& kickedobj->ocarry == mon)
return 1; /* alert shk caught it */
g.notonhead = (mon->mx != bhitpos.x || mon->my != bhitpos.y);
notonhead = (mon->mx != bhitpos.x || mon->my != bhitpos.y);
if (isgold ? ghitm(mon, kickedobj) /* caught? */
: thitmonst(mon, kickedobj)) /* hit && used up? */
return 1;