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.
This commit is contained in:
@@ -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
|
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
|
fix bad grammar when putting on not-yet-seen Eyes of the Overworld while blind
|
||||||
don't "walk quietly" while levitating
|
don't "walk quietly" while levitating
|
||||||
|
fix message handling when multiple shopkeepers are present at end of game
|
||||||
|
|
||||||
|
|
||||||
Platform- and/or Interface-Specific Fixes
|
Platform- and/or Interface-Specific Fixes
|
||||||
|
|||||||
@@ -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. */
|
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||||
/* NetHack may be freely redistributed. See license for details. */
|
/* NetHack may be freely redistributed. See license for details. */
|
||||||
|
|
||||||
@@ -1612,7 +1612,7 @@ int croaked;
|
|||||||
/* the simplifying principle is that first-come */
|
/* the simplifying principle is that first-come */
|
||||||
/* already took everything you had. */
|
/* already took everything you had. */
|
||||||
if (numsk > 1) {
|
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.",
|
pline("%s %slooks at your corpse%s and %s.",
|
||||||
Monnam(shkp),
|
Monnam(shkp),
|
||||||
(!shkp->mcanmove || shkp->msleeping) ? "wakes up, " : "",
|
(!shkp->mcanmove || shkp->msleeping) ? "wakes up, " : "",
|
||||||
|
|||||||
Reference in New Issue
Block a user