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.

diff --git a/doc/fixes35.0 b/doc/fixes35.0
index d27d17433f66143e2af3d517bac12fcab9cad7ed..70c58ed427bfc09f6265d4b7407b9e71ff2f007f 100644 (file)
--- 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 04231166a6e4cef62e775da41f0f1b21cbc6ddb3..d261960d6cd5df8fbb80db5233680adb2691ef4d 100644 (file)
--- 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()