From: nethack.allison <nethack.allison>
Date: Sun, 17 Aug 2003 14:35:04 +0000 (+0000)
Subject: message fix for sewer rat from sink
X-Git-Tag: MOVE2GIT~1849
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95e4443c11746e457908b248c6c74d83049dd162;p=nethack

message fix for sewer rat from sink

> Getting a sewer rat from a sink when not blind, but can't see it
> (because of boulders, etc.) gives "Eek! There's it in the sink!"
> [<email deleted>]
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 3f7663312..c114b1ed3 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -127,6 +127,8 @@ hero's appearance should change immediately after mimicing completes
 avoid some uses of "it" in killer messages
 avoid "singular of null?" warning for info lookup of obscure user input
 there was no check for iron bars in dokick() so it defaulted to "empty space"
+if you couldn't see the rat created in a sink for some reason other than
+	blindness, you would get "Eek there's it in the sink."
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/fountain.c b/src/fountain.c
index a96f1d235..38c41e252 100644
--- a/src/fountain.c
+++ b/src/fountain.c
@@ -530,8 +530,9 @@ drinksink()
 			else {
 				mtmp = makemon(&mons[PM_SEWER_RAT],
 						u.ux, u.uy, NO_MM_FLAGS);
-				pline("Eek!  There's %s in the sink!",
-					Blind ? "something squirmy" :
+				if (mtmp) pline("Eek!  There's %s in the sink!",
+					(Blind || !canspotmon(mtmp)) ?
+					"something squirmy" :
 					a_monnam(mtmp));
 			}
 			break;