From 112d2ad1904051160822d1845d1418cca889c0d5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 14 Mar 2012 03:56:02 +0300
Subject: Add support for other gender. Fix per gender and race items
 separation.

---
 src/gui/register.cpp | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'src/gui/register.cpp')

diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 4f696dc9d..eebbfa603 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -67,6 +67,7 @@ RegisterDialog::RegisterDialog(LoginData *data):
     mEmailField(nullptr),
     mMaleButton(nullptr),
     mFemaleButton(nullptr),
+    mOtherButton(nullptr),
     mWrongDataNoticeListener(new WrongDataNoticeListener),
     mLoginData(data)
 {
@@ -97,8 +98,18 @@ RegisterDialog::RegisterDialog(LoginData *data):
     {
         mMaleButton = new RadioButton(_("Male"), "sex", true);
         mFemaleButton = new RadioButton(_("Female"), "sex", false);
-        placer(1, row, mMaleButton);
-        placer(2, row, mFemaleButton);
+        if (serverVersion >= 5)
+        {
+            mOtherButton = new RadioButton(_("Other"), "sex", false);
+            placer(0, row, mMaleButton);
+            placer(1, row, mFemaleButton);
+            placer(2, row, mOtherButton);
+        }
+        else
+        {
+            placer(1, row, mMaleButton);
+            placer(2, row, mFemaleButton);
+        }
 
         row++;
     }
@@ -235,9 +246,13 @@ void RegisterDialog::action(const gcn::ActionEvent &event)
 
             mLoginData->username = mUserField->getText();
             mLoginData->password = mPasswordField->getText();
-            if (mFemaleButton)
-                mLoginData->gender = mFemaleButton->isSelected() ?
-                                     GENDER_FEMALE : GENDER_MALE;
+            if (mFemaleButton && mFemaleButton->isSelected())
+                mLoginData->gender = GENDER_FEMALE;
+            else if (mOtherButton && mOtherButton->isSelected())
+                mLoginData->gender = GENDER_OTHER;
+            else
+                mLoginData->gender = GENDER_MALE;
+
             if (mEmailField)
                 mLoginData->email = mEmailField->getText();
             mLoginData->registerLogin = true;
-- 
cgit v1.2.3-70-g09d2