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

W_WEAPON -> W_WEAPONS

Browse Source 
Report #H9243 misinterpreted W_WEAPON as W_WEP and attributed a
hypothetical ball and chain sanity checking problem to that.
Rename the former to W_WEAPONS to emphasize that it includes
alternate/secondary weapon and quivered stack as well as wielded
weapon.
This commit is contained in:
PatR
2019-10-08 13:26:39 -07:00
parent e92445810f
commit ba3004d6e2
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/do_wear.c
+4 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 do_wear.c $NHDT-Date: 1559670603 2019/06/04 17:50:03 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.109 $ */
/* NetHack 3.6 do_wear.c $NHDT-Date: 1570566377 2019/10/08 20:26:17 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.111 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1101,7 +1101,7 @@ struct obj *otmp;
boolean already_blind = Blind, changed = FALSE;
/* blindfold might be wielded; release it for wearing */
if (otmp->owornmask & W_WEAPON)
if (otmp->owornmask & W_WEAPONS)
remove_worn_item(otmp, FALSE);
setworn(otmp, W_TOOL);
on_msg(otmp);
@@ -1919,7 +1919,7 @@ struct obj *obj;
/* if the armor is wielded, release it for wearing (won't be
welded even if cursed; that only happens for weapons/weptools) */
if (obj->owornmask & W_WEAPON)
if (obj->owornmask & W_WEAPONS)
remove_worn_item(obj, FALSE);
/*
* Setting obj->known=1 is done because setworn() causes hero's AC
@@ -2545,7 +2545,7 @@ doddoremarm()
possibly combined with weapons */
(void) strncpy(context.takeoff.disrobing, "disrobing", CONTEXTVERBSZ);
/* specific activity when handling weapons only */
if (!(context.takeoff.mask & ~W_WEAPON))
if (!(context.takeoff.mask & ~W_WEAPONS))
(void) strncpy(context.takeoff.disrobing, "disarming",
CONTEXTVERBSZ);
(void) take_off();