diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-02-22 19:58:29 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-05 20:36:46 -0700 |
| commit | b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7 (patch) | |
| tree | 67c3d0552af5661b3847ef7e397771bc101e0c7c /src/resources/itemdb.cpp | |
| parent | 77db175ceabe8d05665191835d0250a927d93d32 (diff) | |
| download | Mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.tar.gz Mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.tar.bz2 Mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.tar.xz Mana-b6e7b6c6cb3ea26157e3a78713cc9621dc46b2d7.zip | |
Handling gender with an enum everywhere.
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
Diffstat (limited to 'src/resources/itemdb.cpp')
| -rw-r--r-- | src/resources/itemdb.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp index f4ccc511..bca2b030 100644 --- a/src/resources/itemdb.cpp +++ b/src/resources/itemdb.cpp @@ -53,8 +53,8 @@ void ItemDB::load() mUnknown = new ItemInfo(); mUnknown->setName("Unknown item"); mUnknown->setImageName(""); - mUnknown->setSprite("error.xml", 0); - mUnknown->setSprite("error.xml", 1); + mUnknown->setSprite("error.xml", GENDER_MALE); + mUnknown->setSprite("error.xml", GENDER_FEMALE); XML::Document doc("items.xml"); xmlNodePtr rootNode = doc.rootNode(); @@ -172,11 +172,11 @@ void loadSpriteRef(ItemInfo *itemInfo, xmlNodePtr node) if (gender == "male" || gender == "unisex") { - itemInfo->setSprite(filename, 0); + itemInfo->setSprite(filename, GENDER_MALE); } if (gender == "female" || gender == "unisex") { - itemInfo->setSprite(filename, 1); + itemInfo->setSprite(filename, GENDER_FEMALE); } } |