fix pet feeding feedback (trunk only)

     From a bug report, unseen pet sensed by
telepathy was referred to as "it" in the message given when it ate food.
This code is subtly convoluted and has now been changed at least four or
five times over the years.  This patch changes the terse comment to try to
spell out the intent.  Whether or not the new code actually matches that
intent remains to be seen....

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 7f276be63470d5b222b3e665bdfd08ca26c6c6c7..b52a9c58acae1a1a71644b45cf5a390fcc1e8829 100644 (file)
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -265,6 +265,7 @@ some variations of attempting to use open or close commands on a drawbridge
        didn't give drawbridge-specific feedback
 tin contents can now sometimes be accessed on the same turn that the tin
        starts being opened; when not, the opening feedback is more accurate
+Nth adjustment of feedback when observing a pet eating
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/dogmove.c b/src/dogmove.c
index 9e707f0ee4e130247f90ae219d89220467dae8b0..5d11490339a7fc69fb3543cf62d3e15dbc9f754f 100644 (file)
--- a/src/dogmove.c
+++ b/src/dogmove.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)dogmove.c  3.5     2007/03/26      */
+/*     SCCS Id: @(#)dogmove.c  3.5     2007/08/20      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -196,7 +196,7 @@ int
 dog_eat(mtmp, obj, x, y, devour)
 register struct monst *mtmp;
 register struct obj *obj;      /* if unpaid, then thrown or kicked by hero */
-int x, y;
+int x, y;      /* dog's starting location, might be different from current */
 boolean devour;
 {
        register struct edog *edog = EDOG(mtmp);
@@ -243,13 +243,24 @@ boolean devour;
        if (is_pool(x, y) && !Underwater) {
            /* Don't print obj */
            /* TODO: Reveal presence of sea monster (especially sharks) */
-       } else
-       /* hack: observe the action if either new or old location is in view */
-       /* However, invisible monsters should still be "it" even though out of
-          sight locations should not. */
-       if (cansee(x, y) || cansee(mtmp->mx, mtmp->my))
-           pline("%s %s %s.", mon_visible(mtmp) ? noit_Monnam(mtmp) : "It",
-                 devour ? "devours" : "eats", doname(obj));
+       } else {
+           /* food is at monster's current location, <mx,my>;
+              <x,y> was monster's location at start of this turn;
+              they might be the same but will be different when
+              the monster is moving+eating on same turn */
+           boolean seeobj = cansee(mtmp->mx, mtmp->my),
+                   sawpet = cansee(x, y) && mon_visible(mtmp);
+
+           /* Observe the action if either the food location or the pet
+              itself is in view.  When pet which was in view moves to an
+              unseen spot to eat the food there, avoid referring to that
+              pet as "it".  However, we want "it" if invisible/unsensed
+              pet eats visible food. */
+           if (seeobj || sawpet)
+               pline("%s %s %s.",
+                     (sawpet || canspotmon(mtmp)) ? noit_Monnam(mtmp) : "It",
+                     devour ? "devours" : "eats", distant_name(obj, doname));
+       }
        if (obj->unpaid) {
            Strcpy(objnambuf, xname(obj));
            iflags.suppress_price--;
@@ -366,7 +377,7 @@ int udist;
        omx = mtmp->mx;
        omy = mtmp->my;
 
-       /* if we are carrying sth then we drop it (perhaps near @) */
+       /* if we are carrying something then we drop it (perhaps near @) */
        /* Note: if apport == 1 then our behaviour is independent of udist */
        /* Use udist+1 so steed won't cause divide by zero */
        if (droppables(mtmp)) {