From c76061312e87ca4b8f8ca3d9259ff28da2527594 Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Mon, 25 Mar 2002 09:01:35 +0000 Subject: [PATCH] impaired movement fix Fix the reported problem of incorrect conditional logic making it impossible to bump into closed doors when moving while impaired for the #if STEED configuration. --- doc/fixes34.1 | 1 + src/hack.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index f64340949..4555a75f1 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -16,6 +16,7 @@ kicking thrones no longer loosens rocks wall symbol not replaced when digging while blind and levitating print regular death message when leashed, mounted steed dies of starvation fix more funny messages, new and old +restore the behavior of bumping into closed doors when moving while impaired Platform- and/or Interface-Specific Fixes diff --git a/src/hack.c b/src/hack.c index b9e820f9b..af7e5df45 100644 --- a/src/hack.c +++ b/src/hack.c @@ -1,4 +1,4 @@ -/* SCCS Id: @(#)hack.c 3.4 2002/03/09 */ +/* SCCS Id: @(#)hack.c 3.4 2002/03/24 */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* NetHack may be freely redistributed. See license for details. */ @@ -578,19 +578,17 @@ boolean test_only; else if (x == ux || y == uy) { if (Blind || Stunned || ACURR(A_DEX) < 10 || Fumbling) { #ifdef STEED - if (u.usteed) + if (u.usteed) { You_cant("lead %s through that closed door.", x_monnam(u.usteed, u.usteed->mnamelth ? ARTICLE_NONE : ARTICLE_THE, - (char *)0, SUPPRESS_SADDLE, FALSE)); - else { -#else + (char *)0, SUPPRESS_SADDLE, FALSE)); + } else +#endif + { pline("Ouch! You bump into a door."); exercise(A_DEX, FALSE); -#endif -#ifdef STEED } -#endif } else pline("That door is closed."); } }