killer, level and rooms move to instance globals.

This commit is contained in:
Bart House
2018-12-24 19:50:08 -08:00
parent 198e44216e
commit be5cdcf77a
74 changed files with 793 additions and 790 deletions

View File

@@ -140,7 +140,7 @@ genericptr_t poolcnt;
levl[x][y].typ = POOL, levl[x][y].flags = 0;
/* No kelp! */
del_engr_at(x, y);
water_damage_chain(level.objects[x][y], TRUE);
water_damage_chain(g.level.objects[x][y], TRUE);
if ((mtmp = m_at(x, y)) != 0)
(void) minliquid(mtmp);
@@ -212,7 +212,7 @@ boolean isyou;
/* The location is seen if the hero/monster is invisible
or felt if the hero is blind. */
newsym(x, y);
level.flags.nfountains--;
g.level.flags.nfountains--;
if (isyou && in_town(x, y))
(void) angry_guards(FALSE);
}
@@ -398,7 +398,7 @@ register struct obj *obj;
update_inventory();
levl[u.ux][u.uy].typ = ROOM, levl[u.ux][u.uy].flags = 0;
newsym(u.ux, u.uy);
level.flags.nfountains--;
g.level.flags.nfountains--;
if (in_town(u.ux, u.uy))
(void) angry_guards(FALSE);
return;
@@ -508,11 +508,11 @@ int x, y;
{
if (cansee(x, y) || (x == u.ux && y == u.uy))
pline_The("pipes break! Water spurts out!");
level.flags.nsinks--;
g.level.flags.nsinks--;
levl[x][y].typ = FOUNTAIN, levl[x][y].looted = 0;
levl[x][y].blessedftn = 0;
SET_FOUNTAIN_LOOTED(x, y);
level.flags.nfountains++;
g.level.flags.nfountains++;
newsym(x, y);
}