summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godblessing.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-12 19:27:51 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-13 00:33:57 -0700
commit3663d864c83a72c7cf624617e9a9a5b8b5deaf6a (patch)
treec7d6e8a734b0943b49bee7551df54b85fdd86557 /crawl-ref/source/godblessing.cc
parentef5102b7e89d552ab4c55c71401cd603db9836ee (diff)
downloadcrawl-ref-3663d864c83a72c7cf624617e9a9a5b8b5deaf6a.tar.gz
crawl-ref-3663d864c83a72c7cf624617e9a9a5b8b5deaf6a.zip
Don't check to see if weapons use SK_SLINGS in melee
Diffstat (limited to 'crawl-ref/source/godblessing.cc')
-rw-r--r--crawl-ref/source/godblessing.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/godblessing.cc b/crawl-ref/source/godblessing.cc
index 6056f670dd..47677a07d5 100644
--- a/crawl-ref/source/godblessing.cc
+++ b/crawl-ref/source/godblessing.cc
@@ -140,11 +140,12 @@ void gift_ammo_to_orc(monster* orc, bool initial_gift)
if (!launcher)
ammo.sub_type = MI_TOMAHAWK;
- else if (weapon_skill(*launcher) == SK_SLINGS)
- ammo.sub_type = MI_SLING_BULLET; // ugly special case to avoid stones
else
ammo.sub_type = fires_ammo_type(*launcher);
+ if (ammo.sub_type == MI_STONE)
+ ammo.sub_type = MI_SLING_BULLET; // ugly special case
+
// XXX: should beogh be gifting needles?
// if not, we'd need special checks in player gifting, etc... better to
// go along for now.