Moved the functions which translate strings into enumerations from the XML library into the item and monstermanager modules and reimplemented them using std::maps.

1 files changed, 0 insertions, 58 deletions

diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index f71e5bfd..f5a3ef5a 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -64,62 +64,4 @@ std::string getProperty(xmlNodePtr node, char const *name, std::string const &de
     return def;
 }
 
-unsigned int elementFromString(std::string name)
-{
-    if      (name=="neutral")   return ELEMENT_NEUTRAL;
-    else if (name=="fire")      return ELEMENT_FIRE;
-    else if (name=="water")     return ELEMENT_WATER;
-    else if (name=="earth")     return ELEMENT_EARTH;
-    else if (name=="air")       return ELEMENT_AIR;
-    else if (name=="lightning") return ELEMENT_LIGHTNING;
-    else if (name=="metal")     return ELEMENT_METAL;
-    else if (name=="wood")      return ELEMENT_WOOD;
-    else if (name=="ice")       return ELEMENT_ICE;
-    {
-        return ELEMENT_ILLEGAL;
-    }
-}
-
-ItemType itemTypeFromString (std::string name)
-{
-    if      (name=="generic")           return ITEM_UNUSABLE;
-    else if (name=="usable")            return ITEM_USABLE;
-    else if (name=="equip-1hand")       return ITEM_EQUIPMENT_ONE_HAND_WEAPON;
-    else if (name=="equip-2hand")       return ITEM_EQUIPMENT_TWO_HANDS_WEAPON;
-    else if (name=="equip-torso")       return ITEM_EQUIPMENT_TORSO;
-    else if (name=="equip-arms")        return ITEM_EQUIPMENT_ARMS;
-    else if (name=="equip-head")        return ITEM_EQUIPMENT_HEAD;
-    else if (name=="equip-legs")        return ITEM_EQUIPMENT_LEGS;
-    else if (name=="equip-shield")      return ITEM_EQUIPMENT_SHIELD;
-    else if (name=="equip-ring")        return ITEM_EQUIPMENT_RING;
-    else if (name=="equip-necklace")    return ITEM_EQUIPMENT_NECKLACE;
-    else if (name=="equip-feet")        return ITEM_EQUIPMENT_FEET;
-    else if (name=="equip-ammo")        return ITEM_EQUIPMENT_AMMO;
-    else if (name=="hairsprite")        return ITEM_HAIRSPRITE;
-    else if (name=="racesprite")        return ITEM_RACESPRITE;
-    else
-    {
-        return ITEM_UNKNOWN;
-    }
-}
-
-WeaponType weaponTypeFromString (std::string name)
-{
-    if      (name=="knife")      return WPNTYPE_KNIFE;
-    else if (name=="sword")      return WPNTYPE_SWORD;
-    else if (name=="polearm")    return WPNTYPE_POLEARM;
-    else if (name=="staff")      return WPNTYPE_STAFF;
-    else if (name=="whip")       return WPNTYPE_WHIP;
-    else if (name=="bow")        return WPNTYPE_BOW;
-    else if (name=="shooting")   return WPNTYPE_SHOOTING;
-    else if (name=="mace")       return WPNTYPE_MACE;
-    else if (name=="axe")        return WPNTYPE_AXE;
-    else if (name=="thrown")     return WPNTYPE_THROWN;
-    else
-    {
-        return WPNTYPE_NONE;
-    }
-}
-
-
 } // namespace XML