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

yet another pass at 'A' bugs

Browse Source 
I think this finally quashes the "cursed without otmp" issue.
Various ways of destroying wielded weapon used setnotworn() rather
than unwield(), so the previous change to have unwield() clear the
pending W_WEP bit from takeoff.mask wasn't sufficient to prevent
'A' moving on from another item (blindfold--it's the only thing
processed before primary weapon) to weapon which wasn't there any
more.  Also, if weapon was already set in takeoff.what to be
processed on the next move, clearing W_WEP from takeoff.mask wasn't
sufficient either.

Move the previous unwield() 'fix' to setworn() and setnotworn() and
extend it to include cancel_don() if the item being replaced or
removed is in progress or scheduled for next.  (Most of the time,
remove_worn_item() has already done that before setworn() or
setnotworn() is called.)
This commit is contained in:
PatR
2017-06-08 15:05:24 -07:00
parent 964fd0fdbd
commit 743d3a1eb5
5 changed files with 47 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wield.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wield.c $NHDT-Date: 1496614915 2017/06/04 22:21:55 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.53 $ */
/* NetHack 3.6 wield.c $NHDT-Date: 1496959480 2017/06/08 22:04:40 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.54 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -676,10 +676,6 @@ uwepgone()
pline("%s shining.", Tobjnam(uwep, "stop"));
}
setworn((struct obj *) 0, W_WEP);
/* update takeoff mask in case uwep has just gone away while
its removal via 'A' was pending, similar to what the various
Xyzzy_off(do_wear.c) routines do for armor and accessories */
context.takeoff.mask &= ~W_WEP;
unweapon = TRUE;
update_inventory();
}
@@ -690,7 +686,6 @@ uswapwepgone()
{
if (uswapwep) {
setworn((struct obj *) 0, W_SWAPWEP);
context.takeoff.mask &= ~W_SWAPWEP;
update_inventory();
}
}
@@ -700,7 +695,6 @@ uqwepgone()
{
if (uquiver) {
setworn((struct obj *) 0, W_QUIVER);
context.takeoff.mask &= ~W_QUIVER;
update_inventory();
}
}