summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/actor.h
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-07-11 20:40:13 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-07-11 20:56:37 -0700
commitdaae54a4133a85a6393b9351f17d825cfdcdd126 (patch)
treea2043f59b2c2e9e0a1dda1f0a68ba43c24764efe /crawl-ref/source/actor.h
parent30d9616ef6d9e0f6e5bccaacf4446854ceb757be (diff)
downloadcrawl-ref-daae54a4133a85a6393b9351f17d825cfdcdd126.tar.gz
crawl-ref-daae54a4133a85a6393b9351f17d825cfdcdd126.zip
Improve sleep code
Refactor put_to_sleep() and hibernate() together. Also improve messenging for resisting repeated sleep (by replacing a generic canned message).
Diffstat (limited to 'crawl-ref/source/actor.h')
-rw-r--r--crawl-ref/source/actor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h
index f2c1b42aae..46b5e32636 100644
--- a/crawl-ref/source/actor.h
+++ b/crawl-ref/source/actor.h
@@ -223,7 +223,8 @@ public:
virtual bool fully_petrify(actor *foe, bool quiet = false) = 0;
virtual void slow_down(actor *attacker, int strength) = 0;
virtual void confuse(actor *attacker, int strength) = 0;
- virtual void put_to_sleep(actor *attacker, int strength) = 0;
+ virtual void put_to_sleep(actor *attacker, int strength,
+ bool hibernate = false) = 0;
virtual void weaken(actor *attacker, int pow) = 0;
virtual void expose_to_element(beam_type element, int strength = 0,
bool slow_cold_blood = true) = 0;
@@ -231,7 +232,6 @@ public:
virtual bool can_hibernate(bool holi_only = false,
bool intrinsic_only = false) const;
virtual bool can_sleep(bool holi_only = false) const;
- virtual void hibernate(int power = 0) = 0;
virtual void check_awaken(int disturbance) = 0;
virtual int beam_resists(bolt &beam, int hurted, bool doEffects,
string source = "") = 0;