summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/externs.h
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 21:31:22 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 21:31:22 +0000
commita6d89fbabb631ecbdcbb86c59aa70c28fd7da696 (patch)
treedeea069713bf8cbaf641f4804ff2024674c3b1a3 /crawl-ref/source/externs.h
parentcff1172ef03ea196d3bf59557e983bd0ad6cb7cc (diff)
downloadcrawl-ref-a6d89fbabb631ecbdcbb86c59aa70c28fd7da696.tar.gz
crawl-ref-a6d89fbabb631ecbdcbb86c59aa70c28fd7da696.zip
Consolidate the player and monster draining functions in fight.cc, make
monster draining take multiple levels of negative energy resistance into account, and only set the necromancy conduct if draining actually took place, as with draining beams. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8551 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/externs.h')
-rw-r--r--crawl-ref/source/externs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 85c1920513..52d570fec8 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -335,7 +335,7 @@ public:
virtual bool can_safely_mutate() const = 0;
virtual bool can_bleed() const = 0;
virtual bool mutate() = 0;
- virtual void drain_exp(actor *agent) = 0;
+ virtual bool drain_exp(actor *agent) = 0;
virtual void rot(actor *agent, int amount, int immediate = 0) = 0;
virtual int hurt(const actor *attacker, int amount,
beam_type flavour = BEAM_MISSILE,
@@ -1075,7 +1075,7 @@ public:
void slow_down(actor *, int str);
void confuse(actor *, int strength);
void heal(int amount, bool max_too = false);
- void drain_exp(actor *);
+ bool drain_exp(actor *);
void rot(actor *, int amount, int immediate = 0);
int hurt(const actor *attacker, int amount,
beam_type flavour = BEAM_MISSILE,
@@ -1507,7 +1507,7 @@ public:
void petrify(actor *, int str);
void slow_down(actor *, int str);
void confuse(actor *, int strength);
- void drain_exp(actor *);
+ bool drain_exp(actor *);
void rot(actor *, int amount, int immediate = 0);
int hurt(const actor *attacker, int amount,
beam_type flavour = BEAM_MISSILE,