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

Renamed instance_variables to global_variables and iv to g.

Browse Source
This commit is contained in:
Bart House
2018-11-23 09:27:10 -08:00
parent 14bf74c862
commit f9a0db6c44
21 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/zap.c
View File

@@ -1360,13 +1360,13 @@ struct obj *obj;
if (obj->otyp == SCR_MAIL)
return;
#endif
iv.obj_zapped = TRUE;
g.obj_zapped = TRUE;
if (iv.poly_zapped < 0) {
if (g.poly_zapped < 0) {
/* some may metamorphosize */
for (i = obj->quan; i; i--)
if (!rn2(Luck + 45)) {
iv.poly_zapped = objects[obj->otyp].oc_material;
g.poly_zapped = objects[obj->otyp].oc_material;
break;
}
}
@@ -2065,7 +2065,7 @@ schar zz;
learnwand(obj);
}
iv.poly_zapped = -1;
g.poly_zapped = -1;
for (otmp = level.objects[tx][ty]; otmp; otmp = next_obj) {
next_obj = otmp->nexthere;
/* for zap downwards, don't hit object poly'd hero is hiding under */
@@ -2075,8 +2075,8 @@ schar zz;
hitanything += (*fhito)(otmp, obj);
}
if (iv.poly_zapped >= 0)
create_polymon(level.objects[tx][ty], iv.poly_zapped);
if (g.poly_zapped >= 0)
create_polymon(level.objects[tx][ty], g.poly_zapped);
return hitanything;
}
@@ -2950,16 +2950,16 @@ struct obj *obj; /* wand or spell */
void
zapsetup()
{
iv.obj_zapped = FALSE;
g.obj_zapped = FALSE;
}
void
zapwrapup()
{
/* if do_osshock() set obj_zapped while polying, give a message now */
if (iv.obj_zapped)
if (g.obj_zapped)
You_feel("shuddering vibrations.");
iv.obj_zapped = FALSE;
g.obj_zapped = FALSE;
}
/* called for various wand and spell effects - M. Stephenson */
@@ -5035,7 +5035,7 @@ int damage, tell;
if (damage) {
mtmp->mhp -= damage;
if (DEADMONSTER(mtmp)) {
if (iv.m_using)
if (g.m_using)
monkilled(mtmp, "", AD_RBRE);
else
killed(mtmp);