diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:22:50 +0100 |
| commit | a1e61f8446b7928d854a062f6494e75fe3fec9ab (patch) | |
| tree | 953cba5593a49f818612f38de1149a2763a36aa8 /src/net | |
| parent | 79cb8fa1ca81440e21bcb186785d47c50a608e8e (diff) | |
| parent | 8954a7ca0f70bbf167c9119d26c7bca8407e8da6 (diff) | |
| download | mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.gz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.bz2 mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.tar.xz mana-a1e61f8446b7928d854a062f6494e75fe3fec9ab.zip | |
Merge github.com:mana/mana
Conflicts:
src/localplayer.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/manaserv/charhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/manaserv/manaserv_protocol.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp index 2bc76fa9..5017d6ea 100644 --- a/src/net/manaserv/charhandler.cpp +++ b/src/net/manaserv/charhandler.cpp @@ -103,8 +103,8 @@ void CharHandler::handleCharacterInfo(Net::MessageIn &msg) CachedCharacterInfo info; info.slot = msg.readInt8(); info.name = msg.readString(); - info.gender = msg.readInt8() == ManaServ::GENDER_MALE ? ::GENDER_MALE : - ::GENDER_FEMALE; + info.gender = msg.readInt8() == ManaServ::GENDER_MALE ? + ::GENDER_MALE : ::GENDER_FEMALE; info.hairStyle = msg.readInt8(); info.hairColor = msg.readInt8(); info.level = msg.readInt16(); diff --git a/src/net/manaserv/manaserv_protocol.h b/src/net/manaserv/manaserv_protocol.h index 11de34ef..2b6322ff 100644 --- a/src/net/manaserv/manaserv_protocol.h +++ b/src/net/manaserv/manaserv_protocol.h @@ -26,7 +26,7 @@ namespace ManaServ { enum { PROTOCOL_VERSION = 1, - SUPPORTED_DB_VERSION = 17 + SUPPORTED_DB_VERSION = 18 }; /** @@ -426,8 +426,6 @@ enum BeingDirection /** * Beings Genders - * WARNING: Has to be in sync with the same enum in the Being class - * of the client! */ enum BeingGender { |