From abf1ee5797444ec9feaa47e7e30e130b8f0da97d Mon Sep 17 00:00:00 2001 From: "nethack.rankin" Date: Sat, 28 Sep 2002 06:48:25 +0000 Subject: [PATCH] fix B08011 - request for "wield" change Implement's 's suggestion that the currently wielded weapon be included among the list of inventory candidates for the wield command. It affects the list of letters shown in the prompt and the subset inventory displayed if you respond with '?'; it doesn't change how wielding works or what item you can pick to wield. Do the same thing for quivering: include any currently quivered item among the choices. Also include the secondary weapon as a choice if you're not actively two-weaponing. --- doc/fixes34.1 | 2 ++ src/invent.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/fixes34.1 b/doc/fixes34.1 index e26d6ce53..1e4f78e30 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -258,6 +258,8 @@ with multiple leashes in use, 2nd had 50/50 chance of having unbounded length GOLDOBJ: coins aren't subject to curses/blesses and don't need identification can no longer activate a figurine while engulfed can't use figurines to get too many erinyes or Nazgul +include currently wielded weapon among the list of likely choices for 'w' +likewise for currently quivered ammo among choices for 'Q' Platform- and/or Interface-Specific Fixes diff --git a/src/invent.c b/src/invent.c index 4ef66089b..bf0a58c5e 100644 --- a/src/invent.c +++ b/src/invent.c @@ -829,10 +829,12 @@ register const char *let,*word; || (putting_on(word) && (otmp->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL))) /* already worn */ +#if 0 /* 3.4.1 -- include currently wielded weapon among the choices */ || (!strcmp(word, "wield") && (otmp->owornmask & W_WEP)) +#endif || (!strcmp(word, "ready") && - (otmp->owornmask & (W_WEP | W_SWAPWEP | W_QUIVER))) + (otmp == uwep || (otmp == uswapwep && u.twoweap))) ) { foo--; foox++; -- 2.50.1