end of game shopkeeper messages

     Fix something I accidentally broke nearly three years ago (post 3.4.2,
so the bug appeared in 3.4.3).  A misplaced closing parenthesis caused an
in-sight check to always fail, so the "<shk> looks at your corpse, shakes
his head, and sighs" message when game ends would never occur.  That
situation is extremely rare anyway; it only happens after some other shk
has taken the hero's possessions.

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index a3ca4964ea3ec8c014160587ef2e1d2ec32b45a3..1fa88702c6f0ea9740571e24daf9a8d4f7f52b6d 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -222,6 +222,7 @@ when a potion of acid was dropped into water and exploded, nethack would
 when jumping over an already seen trap, use an() to get appropriate grammar
 fix bad grammar when putting on not-yet-seen Eyes of the Overworld while blind
 don't "walk quietly" while levitating
+fix message handling when multiple shopkeepers are present at end of game
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/shk.c b/src/shk.c
index cb331da37d1fe51df738107a52cc6a2ec6c344f0..83db3538d1e4b20daf13c7c0563a3ca87a4aecc7 100644 (file)
--- a/src/shk.c
+++ b/src/shk.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)shk.c      3.5     2006/05/10      */
+/*     SCCS Id: @(#)shk.c      3.5     2006/05/20      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1612,7 +1612,7 @@ int croaked;
        /* the simplifying principle is that first-come */
        /* already took everything you had.             */
        if (numsk > 1) {
-           if (cansee(shkp->mx, shkp->my && croaked))
+           if (cansee(shkp->mx, shkp->my) && croaked)
                pline("%s %slooks at your corpse%s and %s.",
                      Monnam(shkp),
                      (!shkp->mcanmove || shkp->msleeping) ? "wakes up, " : "",