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

ring theft

Browse Source 
Prevent monkeys from stealing any ring which the hero can't remove due
to it being stuck inside the grip of a cursed weapon.  Nymphs can still do
so though.  From a bug report.
This commit is contained in:
nethack.rankin
2005-02-10 04:25:29 +00:00
parent 556b64e797
commit 847e3358c7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes34.4
+1
View File
@@ -86,6 +86,7 @@ interrupt current activity during certain stages of petrification or vomiting
warning about bad food didn't recognize tin of Medusa meat warning about bad food didn't recognize tin of Medusa meat
eating tainted Medusa corpse caused food poisioning instead of petrification eating tainted Medusa corpse caused food poisioning instead of petrification
avoid potential stale pointer use after magic bag explosion avoid potential stale pointer use after magic bag explosion
monkeys can't steal rings worn under cursed weapon
Platform- and/or Interface-Specific Fixes Platform- and/or Interface-Specific Fixes
src/steal.c
+6 -2
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)steal.c 3.5 2004/11/11 */ /* SCCS Id: @(#)steal.c 3.5 2005/02/09 */
/* 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. */
@@ -315,7 +315,11 @@ gotobj:
else if (otmp == uquiver || (otmp == uswapwep && !u.twoweap)) else if (otmp == uquiver || (otmp == uswapwep && !u.twoweap))
ostuck = FALSE; /* not really worn; curse doesn't matter */ ostuck = FALSE; /* not really worn; curse doesn't matter */
else else
ostuck = (otmp->cursed && otmp->owornmask); ostuck = ((otmp->cursed && otmp->owornmask) ||
/* nymphs can steal rings from under
cursed weapon but animals can't */
(otmp == uright && welded(uwep)) ||
(otmp == uleft && welded(uwep) && bimanual(uwep)));
if (ostuck || !can_carry(mtmp, otmp)) { if (ostuck || !can_carry(mtmp, otmp)) {
static const char * const how[] = { "steal","snatch","grab","take" }; static const char * const how[] = { "steal","snatch","grab","take" };