Moved potion.c globals to instance_globals.

This commit is contained in:
Bart House
2018-11-23 11:23:03 -08:00
parent d37a91a6b8
commit d3c192e5a8
15 changed files with 74 additions and 84 deletions

View File

@@ -14,8 +14,6 @@ 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));
@@ -679,7 +677,7 @@ xchar x, y;
if (mon->isshk && kickedobj->where == OBJ_MINVENT
&& kickedobj->ocarry == mon)
return 1; /* alert shk caught it */
notonhead = (mon->mx != bhitpos.x || mon->my != bhitpos.y);
g.notonhead = (mon->mx != bhitpos.x || mon->my != bhitpos.y);
if (isgold ? ghitm(mon, kickedobj) /* caught? */
: thitmonst(mon, kickedobj)) /* hit && used up? */
return 1;