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

invent, youmonst, hackdir moved to g.

Browse Source
This commit is contained in:
Bart House
2018-12-24 21:04:15 -08:00
parent 90547edb83
commit 8c1a4d9a97
79 changed files with 1093 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/explode.c
View File

@@ -92,7 +92,7 @@ int expltype;
so might get hit by double damage */
grabbed = grabbing = FALSE;
if (u.ustuck && !u.uswallow) {
if (Upolyd && sticks(youmonst.data))
if (Upolyd && sticks(g.youmonst.data))
grabbing = TRUE;
else
grabbed = TRUE;
@@ -184,8 +184,8 @@ int expltype;
break;
case AD_DISN:
explmask[i][j] = (olet == WAND_CLASS)
? !!(nonliving(youmonst.data)
|| is_demon(youmonst.data))
? !!(nonliving(g.youmonst.data)
|| is_demon(g.youmonst.data))
: !!Disint_resistance;
break;
case AD_ELEC:
@@ -501,7 +501,7 @@ int expltype;
} else if (adtyp == AD_PHYS || physical_dmg)
damu = Maybe_Half_Phys(damu);
if (adtyp == AD_FIRE)
(void) burnarmor(&youmonst);
(void) burnarmor(&g.youmonst);
destroy_item(SCROLL_CLASS, (int) adtyp);
destroy_item(SPBOOK_CLASS, (int) adtyp);
destroy_item(POTION_CLASS, (int) adtyp);
@@ -726,9 +726,9 @@ struct obj *obj; /* only scatter this obj */
if (g.multi)
nomul(0);
hitvalu = 8 + stmp->obj->spe;
if (bigmonst(youmonst.data))
if (bigmonst(g.youmonst.data))
hitvalu++;
hitu = thitu(hitvalu, dmgval(stmp->obj, &youmonst),
hitu = thitu(hitvalu, dmgval(stmp->obj, &g.youmonst),
&stmp->obj, (char *) 0);
if (!stmp->obj)
stmp->stopped = TRUE;