B03002 - missing fountain messages

<Someone> reported that dowaternymph and dowaterdemon did not print a message
when their G_GONE checks failed.  Now they do.  I wasn't feeling
imaginative, so the the dowaterdemon message is the same as for no snakes.

diff --git a/doc/fixes34.1 b/doc/fixes34.1
index b3af0decffcaa84aa09e74241f72686934887f83..721dd1bc70409aaf2262112bb8c76fd10d148ba8 100644 (file)
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -142,6 +142,8 @@ hero polymorphed into an exploding monster should explode when attacking
 don't mark holes/trapdoors as seen if you levitate over them while blind
 player polymorphed as rust monster would lose gold in inventory by
        attempting to eat it, even though the eat failed
+no messages were printed when dowaterdemon or dowaternymph failed to create
+       a monster doe to the G_GONE check
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/fountain.c b/src/fountain.c
index a8f4f850aa4743cfedec1d6a4a6470e1e353eee8..4275f368f06fe5a4a013d877753099d649dad334 100644 (file)
--- a/src/fountain.c
+++ b/src/fountain.c
@@ -43,9 +43,9 @@ STATIC_OVL
 void
 dowaterdemon() /* Water demon */
 {
-       register struct monst *mtmp;
+    register struct monst *mtmp;
 
-       if(mvitals[PM_WATER_DEMON].mvflags & G_GONE) return;
+    if(mvitals[PM_WATER_DEMON].mvflags & G_GONE) {
        if((mtmp = makemon(&mons[PM_WATER_DEMON],u.ux,u.uy, NO_MM_FLAGS))) {
            if (!Blind)
                You("unleash %s!", a_monnam(mtmp));
@@ -61,6 +61,8 @@ dowaterdemon() /* Water demon */
            } else if (t_at(mtmp->mx, mtmp->my))
                (void) mintrap(mtmp);
        }
+    } else
+       pline_The("fountain bubbles furiously for a moment, then calms.");
 }
 
 STATIC_OVL void
@@ -68,8 +70,8 @@ dowaternymph() /* Water Nymph */
 {
        register struct monst *mtmp;
 
-       if(mvitals[PM_WATER_NYMPH].mvflags & G_GONE) return;
-       if((mtmp = makemon(&mons[PM_WATER_NYMPH],u.ux,u.uy, NO_MM_FLAGS))) {
+       if(!(mvitals[PM_WATER_NYMPH].mvflags & G_GONE) &&
+          (mtmp = makemon(&mons[PM_WATER_NYMPH],u.ux,u.uy, NO_MM_FLAGS))) {
                if (!Blind)
                   You("attract %s!", a_monnam(mtmp));
                else