From d736570d0122daa6c03cd4c06ca0d0751856ecb4 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Sun, 21 May 2006 04:00:08 +0000 Subject: [PATCH] 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 " 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. --- doc/fixes34.4 | 1 + src/shk.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/fixes34.4 b/doc/fixes34.4 index a3ca4964e..1fa88702c 100644 --- 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 cb331da37..83db3538d 100644 --- 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, " : "", -- 2.40.0