nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

'R' fix

Browse Source 
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.
This commit is contained in:
PatR
2016-04-16 17:25:33 -07:00
parent 953ee96f7e
commit 828c244ff3
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes36.1
View File

@@ -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: more sortloot revisions
post-3.6.0: fix inventory menu for response of '?' to getobj (more sortloot post-3.6.0: fix inventory menu for response of '?' to getobj (more sortloot
revamp fallout) revamp fallout)
post-3.6.0: rings covered by non-cursed gloves not listed as 'R' candidates
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes

3
src/invent.c
View File

@@ -1236,7 +1236,8 @@ register const char *let, *word;
/* worn armor (shirt, suit) covered by worn armor (suit, cloak) /* worn armor (shirt, suit) covered by worn armor (suit, cloak)
or accessory (ring) covered by cursed worn armor (gloves) */ or accessory (ring) covered by cursed worn armor (gloves) */
|| (taking_off(word) || (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") || (!strcmp(word, "write on")
&& (!(otyp == SCR_BLANK_PAPER || otyp == SPE_BLANK_PAPER) && (!(otyp == SCR_BLANK_PAPER || otyp == SPE_BLANK_PAPER)
|| !otmp->dknown || !objects[otyp].oc_name_known)) || !otmp->dknown || !objects[otyp].oc_name_known))