From 34ca68e13b5ead819f911acdc5aaf35285dde78b Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 8 Jun 2009 08:23:48 -0600
Subject: Remove duplicate code from Being

(cherry picked from commit c79406e025a17ec29afca2458f916d3f2d49447d)
---
 src/being.cpp | 41 -----------------------------------------
 src/being.h   |  4 ----
 2 files changed, 45 deletions(-)

diff --git a/src/being.cpp b/src/being.cpp
index 37cb6987..fa97d800 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1025,19 +1025,6 @@ int Being::getHairStyleCount()
     return mNumberOfHairstyles;
 }
 
-int Being::getHairColorCount()
-{
-    return mNumberOfHairColors;
-}
-
-std::string Being::getHairColor(int index)
-{
-    if (index < 0 || index >= mNumberOfHairColors)
-        return "#000000";
-
-    return hairColors[index];
-}
-
 void Being::load()
 {
     // Hairstyles are encoded as negative numbers. Count how far negative
@@ -1048,32 +1035,4 @@ void Being::load()
         hairstyles++;
 
     mNumberOfHairstyles = hairstyles;
-
-    XML::Document doc(HAIR_FILE);
-    xmlNodePtr root = doc.rootNode();
-
-    // Add an initial hair color
-    hairColors.resize(1, "#000000");
-
-    if (!root || !xmlStrEqual(root->name, BAD_CAST "colors"))
-    {
-        logger->log("Error loading being hair configuration file");
-    } else {
-        for_each_xml_child_node(node, root)
-        {
-            if (xmlStrEqual(node->name, BAD_CAST "color"))
-            {
-                int index = atoi(XML::getProperty(node, "id", "-1").c_str());
-                std::string value = XML::getProperty(node, "value", "");
-
-                if (index >= 0 && !value.empty()) {
-                    if (index >= mNumberOfHairColors) {
-                        mNumberOfHairColors = index + 1;
-                        hairColors.resize(mNumberOfHairColors, "#000000");
-                    }
-                    hairColors[index] = value;
-                }
-            }
-        }
-    }
 }
diff --git a/src/being.h b/src/being.h
index 6c849350..dd3627e2 100644
--- a/src/being.h
+++ b/src/being.h
@@ -498,12 +498,8 @@ class Being : public Sprite, public ConfigListener
             internalTriggerEffect(effectId, false, true);
         }
 
-        static int getHairColorCount();
-
         static int getHairStyleCount();
 
-        static std::string getHairColor(int index);
-
         virtual AnimatedSprite *getSprite(int index) const
         { return mSprites[index]; }
 
-- 
cgit v1.2.3-60-g2f50