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

1 files changed, 4 insertions, 10 deletions

diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 9cb7ac7434..a968f7de85 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -221,11 +221,8 @@ int cast_smiting(int power, dist &beam)
             // Maxes out at around 40 damage at 27 Invocations, which is
             // plenty in my book (the old max damage was around 70,
             // which seems excessive).
-            hurt_monster(monster, 7 + (random2(power) * 33 / 191));
-
-            if (monster->hit_points < 1)
-                monster_die(monster, KILL_YOU, NON_MONSTER);
-            else
+            monster->hurt(&you, 7 + (random2(power) * 33 / 191));
+            if (monster->alive())
                 print_wounds(monster);
         }
     }
@@ -278,11 +275,8 @@ int airstrike(int power, dist &beam)
             if (hurted < 0)
                 hurted = 0;
 
-            hurt_monster(monster, hurted);
-
-            if (monster->hit_points < 1)
-                monster_die(monster, KILL_YOU, NON_MONSTER);
-            else
+            monster->hurt(&you, hurted);
+            if (monster->alive())
                 print_wounds(monster);
         }
     }