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

Another round of instance globals changes.

Browse Source
This commit is contained in:
Bart House
2018-12-24 16:43:50 -08:00
parent e5e906dc3b
commit 572ee347b9
78 changed files with 946 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fountain.c
View File

@@ -36,7 +36,7 @@ dowatersnakes()
register int num = rn1(5, 2);
struct monst *mtmp;
if (!(mvitals[PM_WATER_MOCCASIN].mvflags & G_GONE)) {
if (!(g.mvitals[PM_WATER_MOCCASIN].mvflags & G_GONE)) {
if (!Blind)
pline("An endless stream of %s pours forth!",
Hallucination ? makeplural(rndmonnam(NULL)) : "snakes");
@@ -57,7 +57,7 @@ dowaterdemon()
{
struct monst *mtmp;
if (!(mvitals[PM_WATER_DEMON].mvflags & G_GONE)) {
if (!(g.mvitals[PM_WATER_DEMON].mvflags & G_GONE)) {
if ((mtmp = makemon(&mons[PM_WATER_DEMON], u.ux, u.uy,
NO_MM_FLAGS)) != 0) {
if (!Blind)
@@ -85,7 +85,7 @@ dowaternymph()
{
register struct monst *mtmp;
if (!(mvitals[PM_WATER_NYMPH].mvflags & G_GONE)
if (!(g.mvitals[PM_WATER_NYMPH].mvflags & G_GONE)
&& (mtmp = makemon(&mons[PM_WATER_NYMPH], u.ux, u.uy,
NO_MM_FLAGS)) != 0) {
if (!Blind)
@@ -542,7 +542,7 @@ drinksink()
/* boiling water burns considered fire damage */
break;
case 3:
if (mvitals[PM_SEWER_RAT].mvflags & G_GONE)
if (g.mvitals[PM_SEWER_RAT].mvflags & G_GONE)
pline_The("sink seems quite dirty.");
else {
mtmp = makemon(&mons[PM_SEWER_RAT], u.ux, u.uy, NO_MM_FLAGS);
@@ -584,7 +584,7 @@ drinksink()
break;
case 7:
pline_The("%s moves as though of its own will!", hliquid("water"));
if ((mvitals[PM_WATER_ELEMENTAL].mvflags & G_GONE)
if ((g.mvitals[PM_WATER_ELEMENTAL].mvflags & G_GONE)
|| !makemon(&mons[PM_WATER_ELEMENTAL], u.ux, u.uy, NO_MM_FLAGS))
pline("But it quiets down.");
break;