diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-01-05 17:04:43 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-01-05 17:04:43 +0300 |
commit | 6f9af529d0ac68ae8321ccff34268766a1b4c236 (patch) | |
tree | bfe560e66a4d2ec0533a5be3f590db113c08d175 | |
parent | c6bbebbb52e08c456facaf4649f0d5ea3f45840d (diff) | |
download | mv-6f9af529d0ac68ae8321ccff34268766a1b4c236.tar.gz mv-6f9af529d0ac68ae8321ccff34268766a1b4c236.tar.bz2 mv-6f9af529d0ac68ae8321ccff34268766a1b4c236.tar.xz mv-6f9af529d0ac68ae8321ccff34268766a1b4c236.zip |
Simplify setting default gender.
-rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 3 | ||||
-rw-r--r-- | src/gui/windows/charcreatedialog.h | 3 | ||||
-rw-r--r-- | src/net/eathena/charserverhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 802340dd3..fa52d2227 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -578,8 +578,7 @@ void CharCreateDialog::setAttributes(const StringVect &labels, setButtonsPosition(w, h); } -void CharCreateDialog::setFixedGender(const bool fixed, - const Gender::Type gender) +void CharCreateDialog::setDefaultGender(const Gender::Type gender) { mDefaultGender = gender; mPlayer->setGender(gender); diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 79aa1fe6a..606233276 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -73,8 +73,7 @@ class CharCreateDialog final : public Window, const int available, const int min, const int max); - void setFixedGender(const bool fixed, - const Gender::Type gender = Gender::FEMALE); + void setDefaultGender(const Gender::Type gender = Gender::FEMALE); void logic() override final; diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 4eb4725e0..924e42844 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -350,7 +350,7 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *const window) const Token &token = static_cast<LoginHandler*>(loginHandler)->getToken(); mCharCreateDialog->setAttributes(attributes, 0, 0, 0); - mCharCreateDialog->setFixedGender(true, token.sex); + mCharCreateDialog->setDefaultGender(token.sex); } void CharServerHandler::processCharLogin(Net::MessageIn &msg) diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index b2b754bcb..68d7c77ea 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -377,7 +377,7 @@ void CharServerHandler::setCharCreateDialog(CharCreateDialog *const window) sumStat = 30; mCharCreateDialog->setAttributes(attributes, sumStat, minStat, maxStat); - mCharCreateDialog->setFixedGender(true, token.sex); + mCharCreateDialog->setDefaultGender(token.sex); } void CharServerHandler::processCharLogin(Net::MessageIn &msg) |