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

3 files changed, 9 insertions, 7 deletions

diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index c05d4604..8fd60110 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,12 +172,12 @@ 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);
     }
 }
 
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index fb2c8ffe..201b8ca9 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -24,7 +24,7 @@
 #include "itemdb.h"
 
 const std::string&
-ItemInfo::getSprite(int gender) const
+ItemInfo::getSprite(Gender gender) const
 {
     if (mView)
     {
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 4678bc08..b7729d2c 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -28,6 +28,8 @@
 
 #include "spritedef.h"
 
+#include "../being.h"
+
 enum EquipmentSoundEvent
 {
     EQUIP_EVENT_STRIKE,
@@ -91,10 +93,10 @@ class ItemInfo
         void setView(int view)
         { mView = view; }
 
-        void setSprite(const std::string &animationFile, int gender)
+        void setSprite(const std::string &animationFile, Gender gender)
         { mAnimationFiles[gender] = animationFile; }
 
-        const std::string& getSprite(int gender) const;
+        const std::string& getSprite(Gender gender) const;
 
         void setWeaponType(int);