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

Even more globals moved to instance_globals.c

Browse Source
This commit is contained in:
Bart House
2018-11-24 18:46:36 -08:00
parent ff5fe26e72
commit e4ab048c90
14 changed files with 269 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/do_wear.c
View File

@@ -71,10 +71,6 @@ struct obj *otmp;
}
}
/* starting equipment gets auto-worn at beginning of new game,
and we don't want stealth or displacement feedback then */
static boolean initial_don = FALSE; /* manipulated in set_wear() */
/* putting on or taking off an item which confers stealth;
give feedback and discover it iff stealth state is changing */
STATIC_OVL
@@ -84,7 +80,7 @@ struct obj *obj;
long oldprop; /* prop[].extrinsic, with obj->owornmask stripped by caller */
boolean on;
{
if (on ? initial_don : context.takeoff.cancelled_don)
if (on ? g.initial_don : context.takeoff.cancelled_don)
return;
if (!oldprop /* extrinsic stealth from something else */
@@ -118,7 +114,7 @@ struct obj *obj;
long oldprop; /* prop[].extrinsic, with obj->owornmask stripped by caller */
boolean on;
{
if (on ? initial_don : context.takeoff.cancelled_don)
if (on ? g.initial_don : context.takeoff.cancelled_don)
return;
if (!oldprop /* extrinsic displacement from something else */
@@ -1161,7 +1157,7 @@ void
set_wear(obj)
struct obj *obj; /* if null, do all worn items; otherwise just obj itself */
{
initial_don = !obj;
g.initial_don = !obj;
if (!obj ? ublindf != 0 : (obj == ublindf))
(void) Blindf_on(ublindf);
@@ -1187,7 +1183,7 @@ struct obj *obj; /* if null, do all worn items; otherwise just obj itself */
if (!obj ? uarms != 0 : (obj == uarms))
(void) Shield_on();
initial_don = FALSE;
g.initial_don = FALSE;
}
/* check whether the target object is currently being put on (or taken off--