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 3f76633128a5d43b3e2f41dc68afe6d2688cc157..c114b1ed3abdde56f5739979d4f83f3fbccdab13 100644 (file)
--- 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 a96f1d23525beda96ebcaa658525d901d0bf1631..38c41e25202e5cf4ca71280162db13ee40c01385 100644 (file)
--- 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;