From 6f9af529d0ac68ae8321ccff34268766a1b4c236 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 5 Jan 2015 17:04:43 +0300 Subject: Simplify setting default gender. --- src/gui/windows/charcreatedialog.cpp | 3 +-- src/gui/windows/charcreatedialog.h | 3 +-- src/net/eathena/charserverhandler.cpp | 2 +- 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)->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) -- cgit v1.2.3-70-g09d2