Merfolk (water/ice) elementalists join the Shoals guard.

1 files changed, 6 insertions, 0 deletions

diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h
index 61f5640d07..7c60170f41 100644
--- a/crawl-ref/source/beam.h
+++ b/crawl-ref/source/beam.h
@@ -62,6 +62,8 @@ typedef bool (*explosion_aoe_func)(bolt& beam, const coord_def& target);
 struct bolt
 {
     // INPUT parameters set by caller
+    spell_type  origin_spell;          // may be SPELL_NO_SPELL for non-spell
+                                       // beams.
     int         range;
     unsigned    type;                  // missile gfx
     int         colour;
@@ -192,6 +194,7 @@ public:
 
     // Return whether any affected cell was seen.
     bool explode(bool show_more = true, bool hole_in_the_middle = false);
+    bool knockback_actor(actor *actor);
 
 private:
     void do_fire();
@@ -213,6 +216,7 @@ private:
     bool nasty_to(const monsters* mon) const;
     bool nice_to(const monsters* mon) const;
     bool found_player() const;
+    bool need_regress() const;
 
     int beam_source_as_target() const;
     int range_used_on_hit(const actor* victim) const;
@@ -241,6 +245,8 @@ public:
     void affect_place_explosion_clouds();
     void affect_endpoint();
 
+    void water_hits_actor(actor *act);
+
     // Stuff when a monster or player is hit.
     void affect_player_enchantment();
     void tracer_affect_player();