diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-05-17 20:43:09 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-05-17 20:43:09 +0300 |
commit | 3ba28f181216a150b3a59d912a8bbd9f8392f901 (patch) | |
tree | f75db51afc1f38f324c2ffeb13fcdd608372af21 /src/gui/outfitwindow.h | |
parent | b43ea5469c75cf8ceddc627d545a8e0e4175c68e (diff) | |
download | mv-3ba28f181216a150b3a59d912a8bbd9f8392f901.tar.gz mv-3ba28f181216a150b3a59d912a8bbd9f8392f901.tar.bz2 mv-3ba28f181216a150b3a59d912a8bbd9f8392f901.tar.xz mv-3ba28f181216a150b3a59d912a8bbd9f8392f901.zip |
improve outfitwindow.
Diffstat (limited to 'src/gui/outfitwindow.h')
-rw-r--r-- | src/gui/outfitwindow.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h index 38751f80d..cc17e1839 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/outfitwindow.h @@ -28,12 +28,6 @@ #include <guichan/actionlistener.hpp> #include <guichan/mouselistener.hpp> -#ifdef __GNUC__ -#define A_PURE __attribute__ ((pure)) -#else -#define A_PURE -#endif - const unsigned int OUTFITS_COUNT = 100; const unsigned int OUTFIT_ITEM_COUNT = 16; @@ -42,7 +36,8 @@ class CheckBox; class Item; class Label; -class OutfitWindow final : public Window, private gcn::ActionListener +class OutfitWindow final : public Window, + private gcn::ActionListener { public: /** @@ -120,6 +115,7 @@ class OutfitWindow final : public Window, private gcn::ActionListener int getIndexFromGrid(const int pointX, const int pointY) const A_WARN_UNUSED; + void save() const; int mBoxWidth; int mBoxHeight; @@ -127,21 +123,18 @@ class OutfitWindow final : public Window, private gcn::ActionListener int mCursorPosY; int mGridWidth; int mGridHeight; - bool mItemClicked; Item *mItemMoved; - void save(); - int mItems[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT]; - unsigned char mItemColors[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT]; - bool mItemsUnequip[OUTFITS_COUNT]; int mItemSelected; - unsigned char mItemColorSelected; - int mAwayOutfit; gcn::Color mBorderColor; gcn::Color mBackgroundColor; + unsigned char mItemColors[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT]; + unsigned char mItemColorSelected; + bool mItemClicked; + bool mItemsUnequip[OUTFITS_COUNT]; static float mAlpha; }; |