Remove residual references re: statue special-cased spells.

1 files changed, 5 insertions, 18 deletions

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 38ea48f34f..a4f3d7cdad 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -978,15 +978,12 @@ bool invalid_monster_index(int i)
     return i < 0 || i >= MAX_MONSTERS;
 }
 
-bool mons_is_statue(monster_type mc, bool allow_disintegrate)
+bool mons_is_statue(monster_type mc)
 {
-    if (mc == MONS_ORANGE_STATUE || mc == MONS_SILVER_STATUE)
-        return true;
-
-    if (!allow_disintegrate)
-        return mc == MONS_ICE_STATUE || mc == MONS_ROXANNE;
-
-    return false;
+    return mc == MONS_ORANGE_STATUE
+           || mc == MONS_SILVER_STATUE
+           || mc == MONS_ICE_STATUE
+           || mc == MONS_ROXANNE;
 }
 
 bool mons_is_mimic(monster_type mc)
@@ -2042,12 +2039,6 @@ int exper_value(const monster* mon, bool real)
     if (mons_class_flag(mc, M_NO_EXP_GAIN))
         return 0;
 
-    // The beta26 statues have non-spell-like abilities that the experience
-    // code can't see, so inflate their XP a bit.  Ice statues and Roxanne
-    // get plenty of XP for their spells.
-    if (mc == MONS_ORANGE_STATUE || mc == MONS_SILVER_STATUE)
-        return hd * 15;
-
     x_val = (16 + maxhp) * hd * hd / 10;
 
     // Let's calculate a simple difficulty modifier. - bwr
@@ -3432,10 +3423,6 @@ bool mons_has_los_ability(monster_type mon_type)
         return true;
     }
 
-    // Although not using spells, these are exceedingly dangerous.
-    if (mon_type == MONS_SILVER_STATUE || mon_type == MONS_ORANGE_STATUE)
-        return true;
-
     // Beholding just needs LOS.
     if (mons_genus(mon_type) == MONS_MERMAID)
         return true;