summaryrefslogtreecommitdiff
path: root/src/gui/charcreatedialog.h
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-01-18 19:20:34 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-02-02 15:31:41 +0100
commitf5de9ae444f1bca1f6ba6969214e9a8cacb15f68 (patch)
treef9b9c699c52d279cdc4d93b09f48dd3b24403f5b /src/gui/charcreatedialog.h
parent7cc504d993fa948ae2e10848993f4552b2d6daaa (diff)
downloadmana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.tar.gz
mana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.tar.bz2
mana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.tar.xz
mana-f5de9ae444f1bca1f6ba6969214e9a8cacb15f68.zip
Fix to the hair colors and styles handling.
- I made the charCreatedialog handle a possible max permitted color Id and a minimum hair style id for tA. - Added a foundation to later load the styles and colors from the same file, to handle the Mana-issue #224 for manaserv. - Support for non-contiguous hair color and style ids has also been added. - I also replaced the < and > arrow signs with images. Reviewed-by: Ben Longbons, Thorbjørn Lindeijer
Diffstat (limited to 'src/gui/charcreatedialog.h')
-rw-r--r--src/gui/charcreatedialog.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h
index 42a57ab5..7548bbff 100644
--- a/src/gui/charcreatedialog.h
+++ b/src/gui/charcreatedialog.h
@@ -34,6 +34,7 @@
#include <string>
#include <vector>
+class Button;
class LocalPlayer;
class PlayerBox;
@@ -83,11 +84,11 @@ class CharCreateDialog : public Window, public gcn::ActionListener
gcn::TextField *mNameField;
gcn::Label *mNameLabel;
- gcn::Button *mNextHairColorButton;
- gcn::Button *mPrevHairColorButton;
+ Button *mNextHairColorButton;
+ Button *mPrevHairColorButton;
gcn::Label *mHairColorLabel;
- gcn::Button *mNextHairStyleButton;
- gcn::Button *mPrevHairStyleButton;
+ Button *mNextHairStyleButton;
+ Button *mPrevHairStyleButton;
gcn::Label *mHairStyleLabel;
gcn::RadioButton *mMale;
@@ -107,8 +108,11 @@ class CharCreateDialog : public Window, public gcn::ActionListener
Being *mPlayer;
PlayerBox *mPlayerBox;
- int mHairStyle;
- int mHairColor;
+ // A vector containing the available hair color or style ids
+ std::vector<int> mHairColorsIds;
+ std::vector<int> mHairStylesIds;
+ int mHairStyleId;
+ int mHairColorId;
int mSlot;
};