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/spl-cast.cc | |
| 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/spl-cast.cc')
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index a0274b61d5..7a55036f2c 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -2575,9 +2575,8 @@ void MiscastEffect::_ouch(int dam, beam_type flavour) beem.flavour = flavour; dam = mons_adjust_flavoured(mon_target, beem, dam, true); - hurt_monster(mon_target, dam); - - if (mon_target->hit_points < 1) + mon_target->hurt(NULL, dam, BEAM_MISSILE, false); + if (!mon_target->alive()) monster_die(mon_target, kt, kill_source); } else |