From 84912ad5cf2a8bbc40a7a6e4f3aa8607c04238d6 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 13 Mar 2008 15:35:14 +0000
Subject: Abolish M_HUMANOID flag as it wasn't used anywhere. Comments claimed
 it was necessary for Glamour but even that appears to have used another
 function, mons_is_humanoid(), that made checks against monster glyph instead.
 Strange.

So in case anyone is badly in need of a monster flag, no. 15 is free! :)


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3623 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/mon-util.cc | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

(limited to 'crawl-ref/source/mon-util.cc')

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 104de1f101..edbb7de93a 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -467,42 +467,6 @@ bool mons_is_demon( int mc )
     return (false);
 }
 
-// Used for elven Glamour ability. -- bwr
-bool mons_is_humanoid( int mc )
-{
-    switch (mons_char( mc))
-    {
-    case 'o':   // orcs
-    case 'e':   // elvens (deep)
-    case 'c':   // centaurs
-    case 'C':   // giants
-    case 'O':   // ogres
-    case 'K':   // kobolds
-    case 'N':   // nagas
-    case '@':   // adventuring humans
-    case 'T':   // trolls
-        return (true);
-
-    case 'm':   // merfolk
-        if (mc == MONS_MERFOLK || mc == MONS_MERMAID)
-            return (true);
-        return (false);
-
-    case 'g':   // goblines, hobgoblins, gnolls, boggarts -- but not gargoyles
-        if (mc != MONS_GARGOYLE
-            && mc != MONS_METAL_GARGOYLE
-            && mc != MONS_MOLTEN_GARGOYLE)
-        {
-            return (true);
-        }
-
-    default:
-        break;
-    }
-
-    return (false);
-}
-
 int mons_zombie_size(int mc)
 {
     return (smc->zombie_size);
@@ -5642,8 +5606,7 @@ mon_body_shape get_mon_shape(const int type)
     case 'c': // centaurs
         return(MON_SHAPE_CENTAUR);
     case 'd': // draconions and drakes
-        if (mons_genus(type) == MONS_DRACONIAN
-            || mons_class_flag(type, M_HUMANOID))
+        if (mons_genus(type) == MONS_DRACONIAN)
         {
             if (mons_class_flag(type, M_FLIES))
                 return(MON_SHAPE_HUMANOID_WINGED_TAILED);
-- 
cgit v1.2.3-54-g00ecf