diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
| commit | 22142fd2cc8dd262ca1202ffeb5f4ef714870c4c (patch) | |
| tree | ca0a1eaeb781baec2c4e5b22cf9df60fa89f2982 /src/game-server/character.cpp | |
| parent | 5bd0ddb6e2d1b002372541f911a2764ed2e54e6c (diff) | |
| parent | a5895b1655be3e81f451844a911eab8b798fa7ab (diff) | |
| download | manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.gz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.bz2 manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.xz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/character.cpp
src/scripting/lua.cpp
Diffstat (limited to 'src/game-server/character.cpp')
| -rw-r--r-- | src/game-server/character.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game-server/character.cpp b/src/game-server/character.cpp index 0cdd57b1..41d05455 100644 --- a/src/game-server/character.cpp +++ b/src/game-server/character.cpp @@ -301,9 +301,11 @@ void Character::setGender(int gender) { switch (gender) { - case GENDER_MALE: - case GENDER_FEMALE: - mGender = (BeingGender)gender; + case 0: + mGender = GENDER_MALE; + break; + case 1: + mGender = GENDER_FEMALE; break; default: mGender = GENDER_UNSPECIFIED; |