diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-06-30 22:43:38 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-06-30 22:43:38 +0300 |
commit | 2b62aea7eaa69010c00476ccd7e03729ccac6226 (patch) | |
tree | d479bbfa52f344df12da471b534343f402f62a9d /src/net | |
parent | 14bdb1d3ef3f337b34e68d054bee4a8bdd8bbc13 (diff) | |
download | mv-2b62aea7eaa69010c00476ccd7e03729ccac6226.tar.gz mv-2b62aea7eaa69010c00476ccd7e03729ccac6226.tar.bz2 mv-2b62aea7eaa69010c00476ccd7e03729ccac6226.tar.xz mv-2b62aea7eaa69010c00476ccd7e03729ccac6226.zip |
Rename "other" gender into "hidden" gender.
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/ea/loginhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/playerrecv.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/serverfeatures.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/serverfeatures.h | 2 | ||||
-rw-r--r-- | src/net/serverfeatures.h | 2 | ||||
-rw-r--r-- | src/net/tmwa/beingrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/serverfeatures.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 3b0f7bda3..2d6351c90 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -115,7 +115,7 @@ void LoginHandler::registerAccount(const LoginData *const loginData1) const case Gender::MALE: username.append("_M"); break; - case Gender::OTHER: + case Gender::HIDDEN: username.append("_O"); break; case Gender::UNSPECIFIED: diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp index 7ae05eba6..11d9e9bc1 100644 --- a/src/net/eathena/playerrecv.cpp +++ b/src/net/eathena/playerrecv.cpp @@ -471,8 +471,8 @@ void PlayerRecv::processOnlineList(Net::MessageIn &msg) { if ((status & BeingFlag::GENDER_MALE) != 0) gender = Gender::MALE; - else if ((status & BeingFlag::GENDER_OTHER) != 0) - gender = Gender::OTHER; + else if ((status & BeingFlag::GENDER_HIDDEN) != 0) + gender = Gender::HIDDEN; else gender = Gender::FEMALE; } diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index b3e4b289c..71f8366b9 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -70,7 +70,7 @@ bool ServerFeatures::haveMove3() const return serverVersion > 0; } -bool ServerFeatures::haveCharOtherGender() const +bool ServerFeatures::haveCharHiddenGender() const { return true; } diff --git a/src/net/eathena/serverfeatures.h b/src/net/eathena/serverfeatures.h index d1912be01..f56878772 100644 --- a/src/net/eathena/serverfeatures.h +++ b/src/net/eathena/serverfeatures.h @@ -48,7 +48,7 @@ class ServerFeatures final : public Net::ServerFeatures bool haveMove3() const override final; - bool haveCharOtherGender() const override final; + bool haveCharHiddenGender() const override final; bool haveMonsterAttackRange() const override final A_CONST; diff --git a/src/net/serverfeatures.h b/src/net/serverfeatures.h index defa1e086..f89f93165 100644 --- a/src/net/serverfeatures.h +++ b/src/net/serverfeatures.h @@ -50,7 +50,7 @@ class ServerFeatures notfinal virtual bool haveMove3() const = 0; - virtual bool haveCharOtherGender() const = 0; + virtual bool haveCharHiddenGender() const = 0; virtual bool haveMonsterAttackRange() const = 0; diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index fc523b510..f4b533891 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -1494,7 +1494,7 @@ void BeingRecv::setServerGender(Being *const being, being->setGender(Gender::MALE); break; case 4: - being->setGender(Gender::OTHER); + being->setGender(Gender::HIDDEN); break; default: being->setGender(Gender::UNSPECIFIED); diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index c6e38da8c..db70d836f 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -68,7 +68,7 @@ bool ServerFeatures::haveMove3() const return tmwServerVersion >= 0x0f0512 && tmwServerVersion <= 0xf0706; } -bool ServerFeatures::haveCharOtherGender() const +bool ServerFeatures::haveCharHiddenGender() const { return tmwServerVersion > 0x0f0b17; } diff --git a/src/net/tmwa/serverfeatures.h b/src/net/tmwa/serverfeatures.h index 2f5c118af..26128e46f 100644 --- a/src/net/tmwa/serverfeatures.h +++ b/src/net/tmwa/serverfeatures.h @@ -48,7 +48,7 @@ class ServerFeatures final : public Net::ServerFeatures bool haveMove3() const override final; - bool haveCharOtherGender() const override final; + bool haveCharHiddenGender() const override final; bool haveMonsterAttackRange() const override final; |