From 35b27514c8eede4daa8f07f7b44d9579c78d18cf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 13 Nov 2015 23:36:31 +0300 Subject: Add features.xml attribute for force account gender for new chars. New attribute: forceAccountGender Default value: -1 (mean not forcing) --- src/gui/windows/charcreatedialog.cpp | 7 +++++-- src/gui/windows/registerdialog.cpp | 24 +++++++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index bb55e06ce..39618917e 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -226,8 +226,11 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mGenderStrip->addButton(_("F"), "f", false); // TRANSLATORS: one char size male character gender mGenderStrip->addButton(_("M"), "m", false); - // TRANSLATORS: one char size unknown character gender - mGenderStrip->addButton(_("U"), "u", true); + if (features.getIntValue("forceAccountGender") == -1) + { + // TRANSLATORS: one char size unknown character gender + mGenderStrip->addButton(_("U"), "u", true); + } mGenderStrip->setVisible(Visible_true); add(mGenderStrip); diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index d3deaeb5e..b4f9d8868 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -23,6 +23,9 @@ #include "gui/windows/registerdialog.h" #include "client.h" +#include "configuration.h" + +#include "being/being.h" #include "gui/windows/okdialog.h" @@ -85,8 +88,7 @@ RegisterDialog::RegisterDialog(LoginData &data) : int row = 3; - // for future usage flag - if (true) + if (features.getIntValue("forceAccountGender") == -1) { // TRANSLATORS: register dialog. button. mMaleButton = new RadioButton(this, _("Male"), "sex", true); @@ -265,12 +267,20 @@ void RegisterDialog::action(const ActionEvent &event) mRegisterButton->setEnabled(false); mLoginData->username = mUserField->getText(); mLoginData->password = mPasswordField->getText(); - if (mFemaleButton && mFemaleButton->isSelected()) - mLoginData->gender = Gender::FEMALE; - else if (mOtherButton && mOtherButton->isSelected()) - mLoginData->gender = Gender::OTHER; + if (features.getIntValue("forceAccountGender") == -1) + { + if (mFemaleButton && mFemaleButton->isSelected()) + mLoginData->gender = Gender::FEMALE; + else if (mOtherButton && mOtherButton->isSelected()) + mLoginData->gender = Gender::OTHER; + else + mLoginData->gender = Gender::MALE; + } else - mLoginData->gender = Gender::MALE; + { + mLoginData->gender = Being::intToGender( + features.getIntValue("forceAccountGender")); + } if (mEmailField) mLoginData->email = mEmailField->getText(); -- cgit v1.2.3-70-g09d2