diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-02-10 18:21:31 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-02-10 18:21:31 +0300 |
commit | c10177d08a6185431559bea19a296f2f7934340e (patch) | |
tree | 4dbbcc1fbd323a59ff1b3bf38cb04796cb5c3778 | |
parent | 7f9e82c6538dd51992518ee2af23d98a7c39cdeb (diff) | |
download | manaplus-c10177d08a6185431559bea19a296f2f7934340e.tar.gz manaplus-c10177d08a6185431559bea19a296f2f7934340e.tar.bz2 manaplus-c10177d08a6185431559bea19a296f2f7934340e.tar.xz manaplus-c10177d08a6185431559bea19a296f2f7934340e.zip |
Fix compilation warnings.
-rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 14 | ||||
-rw-r--r-- | src/gui/windows/charcreatedialog.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 57d956ca5..1375b4b25 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -127,7 +127,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mMaxRace(CharDB::getMaxRace()), mHairStyle(0), mHairColor(0), - mMaxY(0), + mMaxY(0U), mSlot(slot), mDefaultGender(Gender::FEMALE), mGender(Gender::UNSPECIFIED), @@ -299,12 +299,12 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, mNameField->setDimension(Rect(60, 2, 300, mNameField->getHeight())); - const int labelPadding = getOption("labelPadding", 2); - const int leftX = 120 + mPadding; - const int rightX = 300 + mPadding; - const int labelX = mPadding; - int nameX = leftX + labelPadding; - int y = 30; + const uint32_t labelPadding = getOption("labelPadding", 2); + const uint32_t leftX = 120 + mPadding; + const uint32_t rightX = 300 + mPadding; + const uint32_t labelX = mPadding; + uint32_t nameX = leftX + labelPadding; + uint32_t y = 30; if (mPrevHairColorButton) nameX += mPrevHairColorButton->getWidth(); else if (mPrevHairStyleButton) diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index e41b17157..5f2885049 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -152,7 +152,7 @@ class CharCreateDialog final : public Window, int mHairStyle; int mHairColor; - int mMaxY; + uint32_t mMaxY; int mSlot; |