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
src/mhitm.c
+5 -3
View File
@@ -6,6 +6,8 @@
#include "hack.h"
#include "artifact.h"
extern boolean notonhead;
static NEARDATA boolean vis, far_noise;
static NEARDATA long noisetime;
static NEARDATA struct obj *otmp;
@@ -159,7 +161,7 @@ register struct monst *mtmp;
/* mtmp can be killed */
bhitpos.x = mon->mx;
bhitpos.y = mon->my;
g.notonhead = 0;
notonhead = 0;
result = mattackm(mtmp, mon);
if (result & MM_AGR_DIED)
@@ -177,7 +179,7 @@ register struct monst *mtmp;
if ((result & MM_HIT) && !(result & MM_DEF_DIED) && rn2(4)
&& mon->movement >= NORMAL_SPEED) {
mon->movement -= NORMAL_SPEED;
g.notonhead = 0;
notonhead = 0;
(void) mattackm(mon, mtmp); /* return attack */
}
@@ -1332,7 +1334,7 @@ register struct attack *mattk;
}
break;
case AD_DRIN:
if (g.notonhead || !has_head(pd)) {
if (notonhead || !has_head(pd)) {
if (vis && canspotmon(mdef))
pline("%s doesn't seem harmed.", Monnam(mdef));
/* Not clear what to do for green slimes */