another buglist entry

> fog cloud hit uses "it". I was exploring the insides of a fog
> cloud with my fifth level wizard, and cast force bolt at its
> insides. I got the message "The spell hits it. You destroy the
> fog cloud!". Shouldn't "it" be "the fog cloud"? If so, it is
> debatable whether or not the then second "fog cloud" should
> perhaps be "it"... [<Someone>]

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index d608338063a7c59a97eb4035f2fc0dad34b08036..8919cd27b947c11766f73f5efd07e70b29056298 100644 (file)
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -117,6 +117,8 @@ add looting freehand() check to able_to_loot() to prevent opening container
 Schroedinger's Cat could be placed at wrong location when its box is carried
 travel while polymorphed into a grid bug should not move diagonally
 refine cmdassist handling for grid bugs
+when casting force bolt spell while engulfed go ahead and use the engulfers 
+       name in the hit message rather than "it"
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/zap.c b/src/zap.c
index 47cc93e469d9e211ff8b0d4168c976ecaf767eef..23f72db83ba379556bfa82213a0bc3c0bbeea57b 100644 (file)
--- a/src/zap.c
+++ b/src/zap.c
@@ -2558,7 +2558,8 @@ register const char *str;
 register struct monst *mtmp;
 register const char *force;            /* usually either "." or "!" */
 {
-       if((!cansee(bhitpos.x,bhitpos.y) && !canspotmon(mtmp))
+       if((!cansee(bhitpos.x,bhitpos.y) && !canspotmon(mtmp) &&
+            !(u.uswallow && mtmp == u.ustuck))
           || !flags.verbose)
            pline("%s %s it.", The(str), vtense(str, "hit"));
        else pline("%s %s %s%s", The(str), vtense(str, "hit"),