From: PatR <rankin@nethack.org>
Date: Sun, 17 Apr 2016 00:25:33 +0000 (-0700)
Subject: 'R' fix
X-Git-Tag: NetHack-3.6.1_RC01~826
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=828c244ff3292e652a44a02bfa45b68e81aa4c56;p=nethack

'R' fix

A patch in late January to suppress suits as likely candidates for
the 'R' command when wearing a cloak also unintentionally suppressed
rings when wearing non-cursed (or not yet known to be cursed) gloves.
Cloak always blocks suit removal; gloves only block ring removal if
cursed.
---

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index c6b5bc7cf..78ad1acc2 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -213,6 +213,7 @@ post-3.6.0: fix "object lost" panic during pickup caused by sortloot revamp
 post-3.6.0: more sortloot revisions
 post-3.6.0: fix inventory menu for response of '?' to getobj (more sortloot
 	revamp fallout)
+post-3.6.0: rings covered by non-cursed gloves not listed as 'R' candidates
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/invent.c b/src/invent.c
index 920ea77e0..ae1ce3bd0 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -1236,7 +1236,8 @@ register const char *let, *word;
              /* worn armor (shirt, suit) covered by worn armor (suit, cloak)
                 or accessory (ring) covered by cursed worn armor (gloves) */
              || (taking_off(word)
-                 && inaccessible_equipment(otmp, (const char *) 0, FALSE))
+                 && inaccessible_equipment(otmp, (const char *) 0,
+                                      (boolean) (otmp->oclass == RING_CLASS)))
              || (!strcmp(word, "write on")
                  && (!(otyp == SCR_BLANK_PAPER || otyp == SPE_BLANK_PAPER)
                      || !otmp->dknown || !objects[otyp].oc_name_known))