summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-07 20:28:40 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-07 20:30:18 +0530
commitf608a02a6646ee7a2f56c83de4c05aa01f9d760e (patch)
tree3852e2ced93bd2efddb0e55ad8016cecb28da660 /crawl-ref/source/beam.cc
parent3746a0d9be464e1d03711ce19845e88320ab8b10 (diff)
downloadcrawl-ref-f608a02a6646ee7a2f56c83de4c05aa01f9d760e.tar.gz
crawl-ref-f608a02a6646ee7a2f56c83de4c05aa01f9d760e.zip
Move BEAM_WATER out of the random range used by BEAM_RANDOM, since the game crashes if BEAM_RANDOM picks water (kilobyte).
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 5b2467bda6..ae409a25d5 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -4413,7 +4413,7 @@ void bolt::affect_player()
range_used += range_used_on_hit(&you);
- if (flavour == BEAM_WATER)
+ if (flavour == BEAM_WATER && origin_spell == SPELL_PRIMAL_WAVE)
water_hits_actor(&you);
}
@@ -4782,7 +4782,7 @@ void bolt::monster_post_hit(monsters* mon, int dmg)
else if (dmg)
beogh_follower_convert(mon, true);
- if (flavour == BEAM_WATER)
+ if (flavour == BEAM_WATER && origin_spell == SPELL_PRIMAL_WAVE)
water_hits_actor(mon);
}