From 45d8645ab9144c57c0f99b7b23e520d3420705e6 Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 3 May 2008 01:38:12 +0000 Subject: Simplify still further. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4822 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/effects.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/effects.cc') diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index f802d28c4a..7ce920bba5 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -149,12 +149,15 @@ int holy_word_monsters(int x, int y, int pow, int caster) if (hploss) { retval = 1; - if (monster->alive()) - simple_monster_message(monster, " convulses!"); - else + if (!monster->alive()) + { monster_die(monster, KILL_YOU, 0); + return retval; + } } + simple_monster_message(monster, " convulses!"); + if (monster->speed_increment >= 25) { retval = 1; @@ -274,12 +277,15 @@ int torment_monsters(int x, int y, int pow, int caster) if (hploss) { retval = 1; - if (monster->alive()) - simple_monster_message(monster, " convulses!"); - else + if (!monster->alive()) + { monster_die(monster, KILL_YOU, 0); + return retval; + } } + simple_monster_message(monster, " convulses!"); + return retval; } -- cgit v1.2.3-54-g00ecf