summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-01-17 20:05:52 -0500
committerChuck Miller <shadowmil@gmail.com>2010-01-17 20:05:52 -0500
commit6eb2e01ef6943e4f8ef7cc32ec325e3c22b1f5ec (patch)
tree29e2c4c7266ae1273512603f4bfd43fbd46e39ae
parentb278542da029c629736be8605a9b4d85a6f2b902 (diff)
downloadmana-6eb2e01ef6943e4f8ef7cc32ec325e3c22b1f5ec.tar.gz
mana-6eb2e01ef6943e4f8ef7cc32ec325e3c22b1f5ec.tar.bz2
mana-6eb2e01ef6943e4f8ef7cc32ec325e3c22b1f5ec.tar.xz
mana-6eb2e01ef6943e4f8ef7cc32ec325e3c22b1f5ec.zip
Fix equiping charm items
-rw-r--r--src/resources/itemdb.cpp1
-rw-r--r--src/resources/iteminfo.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index ef7954c9..6f2109d5 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -74,6 +74,7 @@ static ItemType itemTypeFromString(const std::string &name, int id = 0)
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-charm") return ITEM_EQUIPMENT_CHARM;
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;
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 2af4069c..eb0027dd 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -83,7 +83,8 @@ enum ItemType
ITEM_EQUIPMENT_RING,// 9
ITEM_EQUIPMENT_NECKLACE,// 10
ITEM_EQUIPMENT_FEET,// 11
- ITEM_EQUIPMENT_AMMO// 12
+ ITEM_EQUIPMENT_AMMO,// 12
+ ITEM_EQUIPMENT_CHARM// 13
};
/**