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, 5 insertions, 5 deletions

diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index 36124b4e70..2b78d546c8 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -650,11 +650,6 @@ int roll_dice( int num, int size )
     return (ret);
 }
 
-int roll_dice( const struct dice_def &dice )
-{
-    return (roll_dice( dice.num, dice.size ));
-}
-
 // originally designed to randomize evasion -
 // values are slightly lowered near (max) and
 // approach an upper limit somewhere near (limit/2)
@@ -1673,3 +1668,8 @@ int random_rod_subtype()
 {
     return STAFF_SMITING + random2(NUM_STAVES - STAFF_SMITING);
 }
+
+int dice_def::roll() const
+{
+    return roll_dice(this->num, this->size);
+}