From 4d0b7c461fd459e01cab475eb6b01ab5ea9d4689 Mon Sep 17 00:00:00 2001 From: haranp Date: Sat, 4 Oct 2008 14:44:13 +0000 Subject: 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 --- crawl-ref/source/player.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/player.cc') diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index ebd6b2d28b..c0d0cf39e0 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -6450,8 +6450,10 @@ void player::teleport(bool now, bool abyss_shift) you_teleport(); } -int player::hurt(const actor *agent, int amount, beam_type flavour) +int player::hurt(const actor *agent, int amount, beam_type flavour, + bool cleanup_dead) { + // We ignore cleanup_dead here. const monsters *mon = dynamic_cast(agent); if (agent->atype() == ACT_MONSTER) { -- cgit v1.2.3-54-g00ecf