diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-20 16:38:15 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-20 16:38:15 +0300 |
commit | 747dc30f256606e28fd932a9626da7c328114036 (patch) | |
tree | 1b3e7e70ba439d14d4936660d44c95c27816a11b /src/gui/charcreatedialog.cpp | |
parent | cef2952156ab09371ed04beec00d0f1e8615ada9 (diff) | |
download | plus-747dc30f256606e28fd932a9626da7c328114036.tar.gz plus-747dc30f256606e28fd932a9626da7c328114036.tar.bz2 plus-747dc30f256606e28fd932a9626da7c328114036.tar.xz plus-747dc30f256606e28fd932a9626da7c328114036.zip |
fix style in gui directory.
Diffstat (limited to 'src/gui/charcreatedialog.cpp')
-rw-r--r-- | src/gui/charcreatedialog.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp index 6c5430526..4f5a7e811 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/charcreatedialog.cpp @@ -84,11 +84,18 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mPrevHairStyleButton(new Button(this, _("<"), "prevstyle", this)), mHairStyleLabel(new Label(this, _("Hair style:"))), mHairStyleNameLabel(new Label(this, "")), + mNextRaceButton(nullptr), + mPrevRaceButton(nullptr), + mRaceLabel(nullptr), + mRaceNameLabel(nullptr), mActionButton(new Button(this, _("^"), "action", this)), mRotateButton(new Button(this, _(">"), "rotate", this)), mMale(new RadioButton(this, _("Male"), "gender")), mFemale(new RadioButton(this, _("Female"), "gender")), mOther(new RadioButton(this, _("Other"), "gender")), + mAttributeSlider(), + mAttributeLabel(), + mAttributeValue(), mAttributesLeft(new Label(this, strprintf(_("Please distribute %d points"), 99))), mMaxPoints(0), @@ -99,7 +106,13 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mPlayer(new Being(0, ActorSprite::PLAYER, static_cast<uint16_t>(mRace), nullptr)), mPlayerBox(new PlayerBox(mPlayer, "charcreate_playerbox.xml")), + mHairStyle(0), + mHairColor(0), mSlot(slot), + maxHairColor(CharDB::getMaxHairColor()), + minHairColor(CharDB::getMinHairColor()), + maxHairStyle(CharDB::getMaxHairStyle()), + minHairStyle(CharDB::getMinHairStyle()), mAction(0), mDirection(0) { @@ -117,13 +130,8 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mPlayer->setSprite(i, *it); } - maxHairColor = CharDB::getMaxHairColor(); - minHairColor = CharDB::getMinHairColor(); if (!maxHairColor) maxHairColor = ColorDB::getHairSize(); - - maxHairStyle = CharDB::getMaxHairStyle(); - minHairStyle = CharDB::getMinHairStyle(); if (!maxHairStyle) maxHairStyle = mPlayer->getNumOfHairstyles(); @@ -139,13 +147,6 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mRaceLabel = new Label(this, _("Race:")); mRaceNameLabel = new Label(this, ""); } - else - { - mNextRaceButton = nullptr; - mPrevRaceButton = nullptr; - mRaceLabel = nullptr; - mRaceNameLabel = nullptr; - } // Default to a Male character mMale->setSelected(true); |