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/being.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/being.cpp')
| -rw-r--r-- | src/being.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being.cpp b/src/being.cpp index edacbc26..07895eb2 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -73,7 +73,7 @@ Being::Being(int id, int job, Map *map): mParticleEffects(config.getValue("particleeffects", 1)), mEquippedWeapon(NULL), mHairStyle(1), mHairColor(0), - mGender(2), + mGender(GENDER_UNSPECIFIED), mSpeechTime(0), mPx(0), mPy(0), mSprites(VECTOREND_SPRITE, NULL), @@ -95,7 +95,7 @@ Being::Being(int id, int job, Map *map): // Hairstyles are encoded as negative numbers. Count how far negative we can go. int hairstyles = 1; - while (ItemDB::get(-hairstyles).getSprite(0) != "error.xml") + while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) != "error.xml") { hairstyles++; } |