summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/throw.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-06-06 21:55:37 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-06-06 21:55:37 -0700
commit1753d8fc5c15c09e6891a800348246b3ba0542d9 (patch)
tree9919be9a3f0a180174001243a415faa31fa7a490 /crawl-ref/source/throw.cc
parent78da6b61ffca3c1f1f949988219ce8fe6a5fc57c (diff)
downloadcrawl-ref-1753d8fc5c15c09e6891a800348246b3ba0542d9.tar.gz
crawl-ref-1753d8fc5c15c09e6891a800348246b3ba0542d9.zip
Frost ammo no longer causes Dithmenos penance
When fired from a flame launcher, or vice versa. If someone else wants to refactor the throw.cc code to check brands at launch-time, feel free!
Diffstat (limited to 'crawl-ref/source/throw.cc')
-rw-r--r--crawl-ref/source/throw.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/crawl-ref/source/throw.cc b/crawl-ref/source/throw.cc
index 41e4aa3a13..3cde3f689b 100644
--- a/crawl-ref/source/throw.cc
+++ b/crawl-ref/source/throw.cc
@@ -941,9 +941,6 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
if (ammo_brand == SPMSL_FRENZY)
did_god_conduct(DID_HASTY, 6 + random2(3), ammo_brand_known);
- if (bow_brand == SPWPN_FLAME || ammo_brand == SPMSL_FLAME)
- did_god_conduct(DID_FIRE, 1, true);
-
if (did_return)
{
// Fire beam in reverse.