Merge branch 'master' into stripped

Conflicts:
	src/guichan/gui.cpp
	src/guichan/include/guichan/sdl/sdlpixel.hpp

1 files changed, 15 insertions, 1 deletions

diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index e369f1777..ceafcc08e 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -37,6 +37,7 @@
 
 class LocalPlayer;
 class PlayerBox;
+class TextField;
 
 /**
  * Character creation dialog.
@@ -69,6 +70,10 @@ class CharCreateDialog : public Window, public gcn::ActionListener
 
         void setFixedGender(bool fixed, Gender gender = GENDER_FEMALE);
 
+        void logic();
+
+        void updatePlayer();
+
     private:
         int getDistributedPoints() const;
 
@@ -90,17 +95,23 @@ class CharCreateDialog : public Window, public gcn::ActionListener
 
         CharSelectDialog *mCharSelectDialog;
 
-        gcn::TextField *mNameField;
+        TextField *mNameField;
         gcn::Label *mNameLabel;
         gcn::Button *mNextHairColorButton;
         gcn::Button *mPrevHairColorButton;
         gcn::Label *mHairColorLabel;
+        gcn::Label *mHairColorNameLabel;
         gcn::Button *mNextHairStyleButton;
         gcn::Button *mPrevHairStyleButton;
         gcn::Label *mHairStyleLabel;
+        gcn::Label *mHairStyleNameLabel;
         gcn::Button *mNextRaceButton;
         gcn::Button *mPrevRaceButton;
         gcn::Label *mRaceLabel;
+        gcn::Label *mRaceNameLabel;
+
+        gcn::Button *mActionButton;
+        gcn::Button *mRotateButton;
 
         gcn::RadioButton *mMale;
         gcn::RadioButton *mFemale;
@@ -129,6 +140,9 @@ class CharCreateDialog : public Window, public gcn::ActionListener
         unsigned minHairColor;
         unsigned maxHairStyle;
         unsigned minHairStyle;
+
+        unsigned mAction;
+        unsigned mDirection;
 };
 
 #endif // CHAR_CREATE_DIALOG_H