Merge branch 'ranged_combat'

The implementation is done; from here on out it's all balance work, and
that's better done in trunk.

Release the ogre hordes!

1 files changed, 6 insertions, 1 deletions

diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 9c687179dd..301a7ec59b 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -508,6 +508,8 @@ public:
     int         total_weight() const;
     brand_type  damage_brand(int which_attack = -1);
     int         damage_type(int which_attack = -1);
+    random_var  attack_delay(item_def *weapon, item_def *projectile = NULL,
+                             bool random = true, bool scaled = true) const;
     int         constriction_damage() const;
 
     int       has_claws(bool allow_tran = true) const;
@@ -745,6 +747,8 @@ public:
     int usable_tentacles() const;
     bool has_usable_tentacle() const;
 
+    bool form_uses_xl() const;
+
 protected:
     void _removed_beholder(bool quiet = false);
     bool _possible_beholder(const monster* mon) const;
@@ -982,7 +986,8 @@ void contaminate_player(int change, bool controlled = false, bool msg = true);
 
 bool confuse_player(int amount, bool quiet = false);
 
-bool curare_hits_player(int death_source, string name, string source_name);
+bool curare_hits_player(int death_source, int levels, string name,
+                        string source_name);
 bool poison_player(int amount, string source, string source_aux = "",
                    bool force = false);
 void paralyse_player(string source, int amount = 0, int factor = 1);