diff options
| author | Philipp Sehmisch <tmw@crushnet.org> | 2008-02-22 19:58:29 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-05 17:28:29 +0100 |
| commit | 615b1bc6080a3418b18fd4ab93b4212470709731 (patch) | |
| tree | a82805bc56042899bd19620d667d890baefd7413 /src/resources/iteminfo.h | |
| parent | 12d4837d4d8bb6cbb5d4cd4199bb77b76108fa51 (diff) | |
| download | mana-615b1bc6080a3418b18fd4ab93b4212470709731.tar.gz mana-615b1bc6080a3418b18fd4ab93b4212470709731.tar.bz2 mana-615b1bc6080a3418b18fd4ab93b4212470709731.tar.xz mana-615b1bc6080a3418b18fd4ab93b4212470709731.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/iteminfo.h')
| -rw-r--r-- | src/resources/iteminfo.h | 6 |
1 files changed, 4 insertions, 2 deletions
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); |