From e2d75840b0cd83f1459d12c5fc6328e6554f3d33 Mon Sep 17 00:00:00 2001 From: cohrs Date: Sun, 14 Sep 2003 00:01:35 +0000 Subject: [PATCH] quivering coins A while back, I delayed applying this patch after a discussion about quivering coins, because I didn't want to change the behavior of GOLDOBJ vs non-GOLDOBJ games. I'm tired of seeing this diff in my tree, and I recall there was some sentiment that I should have checked it in, so I'm adding the feature in the trunk. --- doc/fixes35.0 | 1 + src/wield.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/doc/fixes35.0 b/doc/fixes35.0 index d27d17433..70c58ed42 100644 --- a/doc/fixes35.0 +++ b/doc/fixes35.0 @@ -29,6 +29,7 @@ class genocide recognizes species name as an example of the class to genocide (Martin Snyder) internals: use Is_box rather than explicitly checking what it checks fix some unreachable messages (either make then reachable or remove them) +can quiver coins when GOLDOBJ is defined Platform- and/or Interface-Specific Fixes diff --git a/src/wield.c b/src/wield.c index 04231166a..d261960d6 100644 --- a/src/wield.c +++ b/src/wield.c @@ -224,10 +224,17 @@ register struct obj *obj; static NEARDATA const char wield_objs[] = { ALL_CLASSES, ALLOW_NONE, WEAPON_CLASS, TOOL_CLASS, 0 }; +#ifdef GOLDOBJ +static NEARDATA const char ready_objs[] = + { COIN_CLASS, ALL_CLASSES, ALLOW_NONE, WEAPON_CLASS, 0 }; +static NEARDATA const char bullets[] = /* (note: different from dothrow.c) */ + { COIN_CLASS, ALL_CLASSES, ALLOW_NONE, GEM_CLASS, WEAPON_CLASS, 0 }; +#else static NEARDATA const char ready_objs[] = { ALL_CLASSES, ALLOW_NONE, WEAPON_CLASS, 0 }; static NEARDATA const char bullets[] = /* (note: different from dothrow.c) */ { ALL_CLASSES, ALLOW_NONE, GEM_CLASS, WEAPON_CLASS, 0 }; +#endif int dowield() -- 2.40.0