From 2b62aea7eaa69010c00476ccd7e03729ccac6226 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 Jun 2018 22:43:38 +0300 Subject: Rename "other" gender into "hidden" gender. --- src/being/being.h | 4 ++-- src/being/beingflag.h | 2 +- src/enums/being/gender.h | 2 +- src/gui/widgets/avatarlistbox.cpp | 8 ++++---- src/gui/windows/charcreatedialog.cpp | 19 +++++++++---------- src/net/ea/loginhandler.cpp | 2 +- src/net/eathena/playerrecv.cpp | 4 ++-- src/net/eathena/serverfeatures.cpp | 2 +- src/net/eathena/serverfeatures.h | 2 +- src/net/serverfeatures.h | 2 +- src/net/tmwa/beingrecv.cpp | 2 +- src/net/tmwa/serverfeatures.cpp | 2 +- src/net/tmwa/serverfeatures.h | 2 +- src/resources/db/itemdb.cpp | 7 ++++--- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/being/being.h b/src/being/being.h index 11593a1ea..ecb684053 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -934,7 +934,7 @@ class Being notfinal : public ActorSprite, return 0; case Gender::MALE: return 1; - case Gender::OTHER: + case Gender::HIDDEN: return 3; } } @@ -950,7 +950,7 @@ class Being notfinal : public ActorSprite, case 1: return Gender::MALE; case 3: - return Gender::OTHER; + return Gender::HIDDEN; } } diff --git a/src/being/beingflag.h b/src/being/beingflag.h index 98bc66813..dede3c9fa 100644 --- a/src/being/beingflag.h +++ b/src/being/beingflag.h @@ -28,7 +28,7 @@ namespace BeingFlag SHOP = 1, AWAY = 2, INACTIVE = 4, - GENDER_OTHER = 32, + GENDER_HIDDEN = 32, GM = 64, GENDER_MALE = 128, SPECIAL = 128 + 64 diff --git a/src/enums/being/gender.h b/src/enums/being/gender.h index aa6a07a64..96e338fd4 100644 --- a/src/enums/being/gender.h +++ b/src/enums/being/gender.h @@ -30,7 +30,7 @@ enumStart(Gender) MALE = 0, FEMALE = 1, UNSPECIFIED = 2, - OTHER = 3 + HIDDEN = 3 } enumEnd(Gender); diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 2c5905aa5..d951984eb 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -264,7 +264,7 @@ void AvatarListBox::draw(Graphics *const graphics) break; default: case Gender::UNSPECIFIED: - case Gender::OTHER: + case Gender::HIDDEN: break; } } @@ -285,7 +285,7 @@ void AvatarListBox::draw(Graphics *const graphics) break; default: case Gender::UNSPECIFIED: - case Gender::OTHER: + case Gender::HIDDEN: break; } } @@ -502,7 +502,7 @@ void AvatarListBox::safeDraw(Graphics *const graphics) break; default: case Gender::UNSPECIFIED: - case Gender::OTHER: + case Gender::HIDDEN: break; } } @@ -523,7 +523,7 @@ void AvatarListBox::safeDraw(Graphics *const graphics) break; default: case Gender::UNSPECIFIED: - case Gender::OTHER: + case Gender::HIDDEN: break; } } diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index f3ff5ca32..be5756102 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -285,12 +285,12 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mGenderStrip->addButton(_("F"), "f", false); if (features.getIntValue("forceAccountGender") == -1) { - if (serverFeatures->haveCharOtherGender()) + if (serverFeatures->haveCharHiddenGender()) { // TRANSLATORS: one char size male character gender mGenderStrip->addButton(_("M"), "m", true); - // TRANSLATORS: one char size other character gender - mGenderStrip->addButton(_("O"), "o", false); + // TRANSLATORS: one char size hidden character gender + mGenderStrip->addButton(_("H"), "h", false); } else { @@ -304,14 +304,13 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, { // TRANSLATORS: one char size male character gender mGenderStrip->addButton(_("M"), "m", true); - if (serverFeatures->haveCharOtherGender()) + if (serverFeatures->haveCharHiddenGender()) { - // TRANSLATORS: one char size other character gender - mGenderStrip->addButton(_("O"), "o", false); + // TRANSLATORS: one char size hidden character gender + mGenderStrip->addButton(_("H"), "h", false); } } - mGenderStrip->setVisible(Visible_true); add(mGenderStrip); @@ -591,10 +590,10 @@ void CharCreateDialog::action(const ActionEvent &event) mGender = Gender::UNSPECIFIED; mPlayer->setGender(mDefaultGender); } - else if (id == "gender_o") + else if (id == "gender_h") { - mGender = Gender::OTHER; - mPlayer->setGender(Gender::OTHER); + mGender = Gender::HIDDEN; + mPlayer->setGender(Gender::HIDDEN); } } 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; diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index c91d74ffd..d6889bd83 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -173,7 +173,7 @@ void ItemDB::load() std::string errFile = paths.getStringValue("spriteErrorFile"); mUnknown->setSprite(errFile, Gender::MALE, 0); mUnknown->setSprite(errFile, Gender::FEMALE, 0); - mUnknown->setSprite(errFile, Gender::OTHER, 0); + mUnknown->setSprite(errFile, Gender::HIDDEN, 0); mUnknown->addTag(mTags["All"]); loadXmlFile(paths.getStringValue("itemsFile"), tagNum, @@ -975,8 +975,9 @@ static void loadSpriteRef(ItemInfo *const itemInfo, XmlNodeConstPtr node) itemInfo->setSprite(filename, Gender::MALE, race); if (gender == "female" || gender == "unisex") itemInfo->setSprite(filename, Gender::FEMALE, race); - if (gender == "other" || gender == "unisex") - itemInfo->setSprite(filename, Gender::OTHER, race); + // "other" is legacy from 20180630 + if (gender == "hidden" || gender == "other" || gender == "unisex") + itemInfo->setSprite(filename, Gender::HIDDEN, race); } static void loadSoundRef(ItemInfo *const itemInfo, XmlNodeConstPtr node) -- cgit v1.2.3-60-g2f50