Expand monster speed handling to work on the level of individual

monsters.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7166 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 3 deletions

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 807b37b010..312e5ae795 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1351,7 +1351,7 @@ int mons_difficulty(int mtype)
             + me->hpdice[3]);
 }
 
-int exper_value( const struct monsters *monster )
+int exper_value(const monsters *monster)
 {
     long x_val = 0;
 
@@ -1361,7 +1361,7 @@ int exper_value( const struct monsters *monster )
     const int  maxhp       = monster->max_hit_points;
 
     // These are some values we care about.
-    const int  speed       = mons_speed(mclass);
+    const int  speed       = mons_speed(monster);
     const int  modifier    = _mons_exp_mod(mclass);
     const int  item_usage  = mons_itemuse(monster);
 
@@ -2011,12 +2011,17 @@ static int _mons_exp_mod(int mc)
     return (smc->exp_mod);
 }
 
-int mons_speed(int mc)
+int mons_class_speed(int mc)
 {
     ASSERT(smc);
     return (smc->speed);
 }
 
+int mons_speed(const monsters *mon)
+{
+    return (mons_class_speed(mon->type));
+}
+
 mon_intel_type mons_class_intel(int mc)
 {
     ASSERT(smc);