From f608a02a6646ee7a2f56c83de4c05aa01f9d760e Mon Sep 17 00:00:00 2001 From: Darshan Shaligram Date: Thu, 7 Jan 2010 20:28:40 +0530 Subject: Move BEAM_WATER out of the random range used by BEAM_RANDOM, since the game crashes if BEAM_RANDOM picks water (kilobyte). --- crawl-ref/source/beam.cc | 4 ++-- crawl-ref/source/enum.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref') 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); } diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 623ee6b7c4..8c43ec175b 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -188,13 +188,13 @@ enum beam_type // beam[].flavour BEAM_MMISSILE, // and similarly irresistible things BEAM_FIRE, BEAM_COLD, - BEAM_WATER, BEAM_MAGIC, BEAM_ELECTRICITY, BEAM_POISON, BEAM_NEG, BEAM_ACID, BEAM_MIASMA, + BEAM_WATER, BEAM_SPORE, BEAM_POISON_ARROW, -- cgit v1.2.3-54-g00ecf