diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-08 23:01:33 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-08 23:01:33 +0000 |
| commit | 65fe4389269de4c14c9b9adbc6ef0308f2059dbd (patch) | |
| tree | afc6825c365eb96aa931ded0bc1840ff34d7d169 /crawl-ref/source/externs.h | |
| parent | 92250a09d1024580b40b197b69462d8f1ede94ef (diff) | |
| download | crawl-ref-65fe4389269de4c14c9b9adbc6ef0308f2059dbd.tar.gz crawl-ref-65fe4389269de4c14c9b9adbc6ef0308f2059dbd.zip | |
Clean up the rotting routines a bit.
For the record, rotting attacks from monsters currently have the same
problem that draining attacks used to, due to monsters::rot()'s directly
modifying the monster's max HP, as well as its directly calling
monsters::hurt().
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8340 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/externs.h')
| -rw-r--r-- | crawl-ref/source/externs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index 86d93be0d4..ea5e82a2e2 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -334,9 +334,10 @@ public: virtual bool can_mutate() const = 0; virtual bool can_safely_mutate() const = 0; virtual bool mutate() = 0; - virtual int hurt(const actor *attacker, int amount, - beam_type flavour = BEAM_MISSILE, - bool cleanup_dead = true) = 0; + virtual void rot(actor *attacker, int rotlevel, int immed_rot) = 0; + virtual int hurt(const actor *attacker, int amount, + beam_type flavour = BEAM_MISSILE, + bool cleanup_dead = true) = 0; virtual void heal(int amount, bool max_too = false) = 0; virtual void banish(const std::string &who = "") = 0; virtual void blink(bool allow_partial_control = true) = 0; @@ -347,7 +348,6 @@ public: virtual void petrify(actor *attacker, int strength) = 0; virtual void slow_down(actor *attacker, int strength) = 0; virtual void confuse(actor *attacker, int strength) = 0; - virtual void rot(actor *attacker, int rotlevel, int immediate_rot) = 0; virtual void expose_to_element(beam_type element, int strength = 0) = 0; virtual void drain_stat(int stat, int amount, actor* attacker) { } virtual void put_to_sleep(int power = 0) { }; @@ -1070,8 +1070,8 @@ public: void petrify(actor *, int str); void slow_down(actor *, int str); void confuse(actor *, int strength); - void rot(actor *agent, int rotlevel, int immed_rot); void heal(int amount, bool max_too = false); + void rot(actor *attacker, int rotlevel, int immed_rot); int hurt(const actor *attacker, int amount, beam_type flavour = BEAM_MISSILE, bool cleanup_dead = true); @@ -1499,7 +1499,7 @@ public: void petrify(actor *, int str); void slow_down(actor *, int str); void confuse(actor *, int strength); - void rot(actor *agent, int rotlevel, int immed_rot); + void rot(actor *, int rotlevel, int immed_rot); int hurt(const actor *attacker, int amount, beam_type flavour = BEAM_MISSILE, bool cleanup_dead = true); |