summaryrefslogtreecommitdiffstats
path: root/src/game-server/itemmanager.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-02-21 17:59:40 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-02-21 17:59:40 +0000
commit12c9a7508dfa863087035f6dc2f73866789927f1 (patch)
tree749b96a4738fcc199c8a7c23bf890f01aefb2e06 /src/game-server/itemmanager.cpp
parentd1649dfdf5628fb49d1c2c50085cd318a87a515f (diff)
downloadmanaserv-12c9a7508dfa863087035f6dc2f73866789927f1.tar.gz
manaserv-12c9a7508dfa863087035f6dc2f73866789927f1.tar.xz
manaserv-12c9a7508dfa863087035f6dc2f73866789927f1.zip
Moved the functions which translate strings into enumerations from the XML library into the item and monstermanager modules and reimplemented them using std::maps.
Diffstat (limited to 'src/game-server/itemmanager.cpp')
-rw-r--r--src/game-server/itemmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp
index 78c7f04..211334f 100644
--- a/src/game-server/itemmanager.cpp
+++ b/src/game-server/itemmanager.cpp
@@ -91,7 +91,7 @@ void ItemManager::reload()
}
std::string sItemType = XML::getProperty(node, "type", "");
- ItemType itemType = XML::itemTypeFromString(sItemType);
+ ItemType itemType = itemTypeFromString(sItemType);
if (itemType == ITEM_UNKNOWN)
{
@@ -128,7 +128,7 @@ void ItemManager::reload()
itemType == ITEM_EQUIPMENT_TWO_HANDS_WEAPON)
{
std::string sWeaponType = XML::getProperty(node, "weapon-type", "");
- WeaponType weaponType = XML::weaponTypeFromString(sWeaponType);
+ WeaponType weaponType = weaponTypeFromString(sWeaponType);
if (weaponType == WPNTYPE_NONE)
{
LOG_WARN(itemReferenceFile<<": Unknown weapon type \""