diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-13 15:46:45 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-13 15:46:45 +0000 |
| commit | c32244f1ca9dfacd55040e1a61c3ff6c5c1ab4d5 (patch) | |
| tree | ad68b92ce822cad4a7ba541282afdeba6b7fd9c4 /crawl-ref/source/externs.h | |
| parent | d436eeaf8f01d5e9b0476254171b6a0bcc2c403d (diff) | |
| download | crawl-ref-c32244f1ca9dfacd55040e1a61c3ff6c5c1ab4d5.tar.gz crawl-ref-c32244f1ca9dfacd55040e1a61c3ff6c5c1ab4d5.zip | |
Remove atk and def from melee_attack.
Rewrite some code to use actor methods instead of calling things
directly. In theory, attacker_as_monster() and defender_as_monster()
are hacks; any calls to them that can be replaced by calls to actor
methods should be.
Fix some inconsistencies with monster bleeding and summoned creatures.
(This should probably go into actor::can_bleed().)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8444 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/externs.h')
| -rw-r--r-- | crawl-ref/source/externs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index d1dfcf0b64..3ded203790 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -333,6 +333,7 @@ public: virtual void go_berserk(bool intentional) = 0; virtual bool can_mutate() const = 0; virtual bool can_safely_mutate() const = 0; + virtual bool can_bleed() const = 0; virtual bool mutate() = 0; virtual void rot(actor *agent, int amount, int immediate = 0) = 0; virtual int hurt(const actor *attacker, int amount, @@ -1053,6 +1054,7 @@ public: void go_berserk(bool intentional); bool can_mutate() const; bool can_safely_mutate() const; + bool can_bleed() const; bool mutate(); void banish(const std::string &who = ""); void blink(bool allow_partial_control = true); @@ -1447,6 +1449,7 @@ public: void go_berserk(bool intentional); bool can_mutate() const; bool can_safely_mutate() const; + bool can_bleed() const; bool mutate(); void banish(const std::string &who = ""); void expose_to_element(beam_type element, int strength = 0); |