Merged creation of female characters from Legend of Mazzeroth.

4 files changed, 55 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e26d757a..fe4722d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* src/gui/skill.cpp, src/localplayer.cpp, src/localplayer.h:
 	Implemented skill name display in skill dialog and xp messages (based
 	on a patch by rodge)
+	* src/gui/char_select.cpp, src/gui/char_select.h, src/player.h:	Merged
+	creation of female characters from Legend of Mazzeroth.
 
 2008-02-21  Philipp Sehmisch  <tmw@crushnet.org>
 
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 96140bb5..17bbbd70 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -28,6 +28,7 @@
 #include <guichan/widgets/label.hpp>
 
 #include "button.h"
+#include "radiobutton.h"
 #include "confirm_dialog.h"
 #include "ok_dialog.h"
 #include "playerbox.h"
@@ -68,7 +69,7 @@ class CharDeleteConfirm : public ConfirmDialog
 };
 
 CharDeleteConfirm::CharDeleteConfirm(CharSelectDialog *m):
-    ConfirmDialog(_("Confirm"),
+    ConfirmDialog(_("Confirm Character Delete"),
                   _("Are you sure you want to delete this character?"), m),
     master(m)
 {
@@ -95,11 +96,13 @@ CharSelectDialog::CharSelectDialog(LockedArray<LocalPlayer*> *charInfo,
     mDelCharButton = new Button(_("Delete"), "delete", this);
     mPreviousButton = new Button(_("Previous"), "previous", this);
     mNextButton = new Button(_("Next"), "next", this);
-    mUnRegisterButton = new Button(_("Unregister"), "unregister", this);
+    mUnRegisterButton = new Button(_("Delete"), "unregister", this);
 
     mNameLabel = new gcn::Label(strprintf(_("Name: %s"), ""));
     mLevelLabel = new gcn::Label(strprintf(_("Level: %d"), 0));
     mMoneyLabel = new gcn::Label(strprintf(_("Money: %d"), 0));
+
+    // Control that shows the Player
     mPlayerBox = new PlayerBox;
     mPlayerBox->setWidth(74);
 
@@ -241,11 +244,13 @@ bool CharSelectDialog::selectByName(const std::string &name)
     return false;
 }
 
+
 CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     Window(_("Create Character"), true, parent), mSlot(slot)
 {
     mPlayer = new Player(0, 0, NULL);
     mPlayer->setHairStyle(rand() % NR_HAIR_STYLES, rand() % NR_HAIR_COLORS);
+    mPlayer->setGender(GENDER_MALE);
 
     mNameField = new TextField("");
     mNameLabel = new gcn::Label(_("Name:"));
@@ -257,7 +262,12 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     mHairStyleLabel = new gcn::Label(_("Hair Style:"));
     mCreateButton = new Button(_("Create"), "create", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
+
+    mMale = new RadioButton(_("Male"), "gender");
+    mFemale = new RadioButton(_("Female"), "gender");
+
     mPlayerBox = new PlayerBox(mPlayer);
+
     mAttributeLabel[0] = new gcn::Label(_("Strength:"));
     mAttributeLabel[1] = new gcn::Label(_("Agility:"));
     mAttributeLabel[2] = new gcn::Label(_("Dexterity:"));
@@ -309,6 +319,18 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
 
     mNameField->addActionListener(this);
 
+    mMale->setPosition( 30, 120 );
+    mFemale->setPosition( 100, 120 );
+
+    // Default to a Male character
+    mMale->setMarked(true);
+
+    mMale->setActionEventId("gender");
+    mFemale->setActionEventId("gender");
+
+    mMale->addActionListener(this);
+    mFemale->addActionListener(this);
+
     add(mPlayerBox);
     add(mNameField);
     add(mNameLabel);
@@ -328,6 +350,9 @@ CharCreateDialog::CharCreateDialog(Window *parent, int slot):
     add(mCreateButton);
     add(mCancelButton);
 
+    add(mMale);
+    add(mFemale);
+
     setLocationRelativeTo(getParent());
     setVisible(true);
     mNameField->requestFocus();
@@ -348,11 +373,20 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
         if (getName().length() >= 4) {
             // Attempt to create the character
             mCreateButton->setEnabled(false);
+
+            unsigned int genderSelected;
+            if( mMale->isMarked() ){
+                genderSelected = GENDER_MALE;
+            } else {
+                genderSelected = GENDER_FEMALE;
+            }
+
+
             Net::AccountServer::Account::createCharacter(
                     getName(),
                     mPlayer->getHairStyle(),
                     mPlayer->getHairColor(),
-                    0,   // gender
+                    genderSelected,   // gender
                     (int) mAttributeSlider[0]->getValue(),  // STR
                     (int) mAttributeSlider[1]->getValue(),  // AGI
                     (int) mAttributeSlider[2]->getValue(),  // DEX
@@ -362,8 +396,7 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
             );
         }
         else {
-            new OkDialog(_("Error"),
-                    _("Your name needs to be at least 4 characters."), this);
+            new OkDialog(_("Error"),_("Your name needs to be at least 4 characters."), this);
         }
     }
     else if (event.getId() == "cancel") {
@@ -384,6 +417,13 @@ CharCreateDialog::action(const gcn::ActionEvent &event)
     else if (event.getId() == "statslider") {
         UpdateSliders();
     }
+    else if (event.getId() == "gender"){
+        if( mMale->isMarked() ) {
+            mPlayer->setGender(GENDER_MALE);
+        } else {
+            mPlayer->setGender(GENDER_FEMALE);
+        }
+    }
 }
 
 std::string
diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index f2d6cbc4..d275c451 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -140,6 +140,9 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         gcn::Button *mPrevHairStyleButton;
         gcn::Label *mHairStyleLabel;
 
+        gcn::RadioButton *mMale;
+        gcn::RadioButton *mFemale;
+
         gcn::Slider *mAttributeSlider[6];
         gcn::Label *mAttributeLabel[6];
         gcn::Label *mAttributeValue[6];
diff --git a/src/player.h b/src/player.h
index eb642d20..7e742a7a 100644
--- a/src/player.h
+++ b/src/player.h
@@ -29,6 +29,11 @@
 class Graphics;
 class Map;
 
+enum Gender {
+    GENDER_MALE = 0,
+    GENDER_FEMALE = 1
+};
+
 /**
  * A player being. Players have their name drawn beneath them. This class also
  * implements player-specific loading of base sprite, hair sprite and equipment