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

B03002 - missing fountain messages

Browse Source 
<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.
This commit is contained in:
cohrs
2002-07-04 18:25:26 +00:00
parent 2c6a1eb7e1
commit 0859b5d30a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.1
+2
View File
@@ -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 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 player polymorphed as rust monster would lose gold in inventory by
attempting to eat it, even though the eat failed 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 Platform- and/or Interface-Specific Fixes
src/fountain.c
+6 -4
View File
@@ -43,9 +43,9 @@ STATIC_OVL
void void
dowaterdemon() /* Water demon */ 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((mtmp = makemon(&mons[PM_WATER_DEMON],u.ux,u.uy, NO_MM_FLAGS))) {
if (!Blind) if (!Blind)
You("unleash %s!", a_monnam(mtmp)); You("unleash %s!", a_monnam(mtmp));
@@ -61,6 +61,8 @@ dowaterdemon() /* Water demon */
} else if (t_at(mtmp->mx, mtmp->my)) } else if (t_at(mtmp->mx, mtmp->my))
(void) mintrap(mtmp); (void) mintrap(mtmp);
} }
} else
pline_The("fountain bubbles furiously for a moment, then calms.");
} }
STATIC_OVL void STATIC_OVL void
@@ -68,8 +70,8 @@ dowaternymph() /* Water Nymph */
{ {
register struct monst *mtmp; register struct monst *mtmp;
if(mvitals[PM_WATER_NYMPH].mvflags & G_GONE) return; if(!(mvitals[PM_WATER_NYMPH].mvflags & G_GONE) &&
if((mtmp = makemon(&mons[PM_WATER_NYMPH],u.ux,u.uy, NO_MM_FLAGS))) { (mtmp = makemon(&mons[PM_WATER_NYMPH],u.ux,u.uy, NO_MM_FLAGS))) {
if (!Blind) if (!Blind)
You("attract %s!", a_monnam(mtmp)); You("attract %s!", a_monnam(mtmp));
else else