diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-04 14:44:13 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-04 14:44:13 +0000 |
commit | 4d0b7c461fd459e01cab475eb6b01ab5ea9d4689 (patch) | |
tree | 3750b8574e0cba9afe96292cf622c385a30ce62e /crawl-ref/source/monstuff.h | |
parent | da0c3f0c317cfb21e88aecbbb90388cc6d087cfe (diff) | |
download | crawl-ref-4d0b7c461fd459e01cab475eb6b01ab5ea9d4689.tar.gz crawl-ref-4d0b7c461fd459e01cab475eb6b01ab5ea9d4689.zip |
Redid monster death idiom so that monsters::hurt can implicitly
call monster_die(). (This behaviour can be overriden.)
Minor code cleanups elsewhere, removal of dead code from bolt.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7123 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.h')
-rw-r--r-- | crawl-ref/source/monstuff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index ee76711d2e..21b58c7126 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -183,7 +183,8 @@ bool message_current_target(void); unsigned int monster_index(const monsters *monster); -void mons_get_damage_level(const monsters*, std::string& desc, mon_dam_level_type&); +void mons_get_damage_level(const monsters*, std::string& desc, + mon_dam_level_type&); int hurt_monster(monsters *victim, int damage_dealt); |