diff options
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/charserverhandler.h | 2 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/token.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/guildhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/logindata.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/charserverhandler.h | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 925346594..29f1a6f30 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -55,7 +55,7 @@ class CharServerHandler notfinal virtual void newCharacter(const std::string &name, const int slot, - const Gender::Type gender, + const GenderT gender, const int hairstyle, const int hairColor, const unsigned char race, diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 8d4937236..092dc8ca1 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -513,7 +513,7 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg) unsigned char ver = *buf; buf ++; - unsigned char gender = Gender::UNSPECIFIED; + GenderT gender = Gender::UNSPECIFIED; if (config.getBoolValue("showgender")) { if (status & BeingFlag::GENDER_MALE) diff --git a/src/net/ea/token.h b/src/net/ea/token.h index a62136aee..0d806656c 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -31,7 +31,7 @@ struct Token final BeingId account_ID; int session_ID1; int session_ID2; - Gender::Type sex; + GenderT sex; void clear() { diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 94530f407..835360c64 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -301,7 +301,7 @@ void CharServerHandler::chooseCharacter(Net::Character *const character) } void CharServerHandler::newCharacter(const std::string &name, const int slot, - const Gender::Type gender, + const GenderT gender, const int hairstyle, const int hairColor, const unsigned char race, const uint16_t look, diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 64968cee4..60f753967 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -47,7 +47,7 @@ class CharServerHandler final : public MessageHandler, void newCharacter(const std::string &name, const int slot, - const Gender::Type gender, + const GenderT gender, const int hairstyle, const int hairColor, const unsigned char race, diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 85609581b..bffe95b94 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -399,7 +399,7 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const BeingId accountId = msg.readBeingId("account id"); const int charId = msg.readInt32("char id"); const int online = msg.readInt32("flag"); - const Gender::Type gender = Being::intToGender(static_cast<uint8_t>( + const GenderT gender = Being::intToGender(static_cast<uint8_t>( msg.readInt16("sex"))); msg.readInt16("hair"); msg.readInt16("hair color"); diff --git a/src/net/logindata.h b/src/net/logindata.h index ddd3685be..acca562fd 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -66,7 +66,7 @@ class LoginData final std::string captchaResponse; std::string registerUrl; - Gender::Type gender; + GenderT gender; bool remember; // Whether to store the username. bool registerLogin; // Whether an account is being registered. diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 6662009b3..32a09817a 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -256,7 +256,7 @@ void CharServerHandler::chooseCharacter(Net::Character *const character) } void CharServerHandler::newCharacter(const std::string &name, const int slot, - const Gender::Type gender A_UNUSED, + const GenderT gender A_UNUSED, const int hairstyle, const int hairColor, const unsigned char race, diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 2d73d5a22..a9f99218e 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -47,7 +47,7 @@ class CharServerHandler final : public MessageHandler, void newCharacter(const std::string &name, const int slot, - const Gender::Type gender, + const GenderT gender, const int hairstyle, const int hairColor, const unsigned char race, |