diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-03 01:38:12 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-03 01:38:12 +0000 |
| commit | 45d8645ab9144c57c0f99b7b23e520d3420705e6 (patch) | |
| tree | 35a84fe93cfa2f24cd169fb3322b668735c1e1f8 /crawl-ref/source/effects.cc | |
| parent | e1c38195d9d9ab0b18c0a5d5827f3e3dd040922d (diff) | |
| download | crawl-ref-45d8645ab9144c57c0f99b7b23e520d3420705e6.tar.gz crawl-ref-45d8645ab9144c57c0f99b7b23e520d3420705e6.zip | |
Simplify still further.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4822 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/effects.cc')
| -rw-r--r-- | crawl-ref/source/effects.cc | 18 |
1 files changed, 12 insertions, 6 deletions
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; } |