From 3eb71b6f5e3a60de5b597ba2f600f3bb57fccde6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 28 Jul 2013 23:41:10 +0300 Subject: move bools in itemcontainer. --- src/gui/widgets/itemcontainer.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/gui/widgets/itemcontainer.h') diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 3358b113c..da9167a7e 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -193,36 +193,36 @@ class ItemContainer final : public gcn::Widget, int getSlotIndex(const int x, const int y) const; Inventory *mInventory; - int mGridColumns, mGridRows; Image *mSelImg; - int mSelectedIndex, mHighlightedIndex; - int mLastUsedSlot; - SelectionState mSelectionStatus; - bool mForceQuantity; - bool mSwapItems; - bool mDescItems; - int mTag; - int mSortType; std::string mName; ItemPopup *mItemPopup; int *mShowMatrix; - int mClicks; Skin *mSkin; + gcn::Color mEquipedColor; + gcn::Color mEquipedColor2; + gcn::Color mUnEquipedColor; + gcn::Color mUnEquipedColor2; + typedef std::list SelectionListenerList; + typedef SelectionListenerList::iterator SelectionListenerIterator; + SelectionListenerList mSelectionListeners; + int mGridColumns; + int mGridRows; + int mSelectedIndex; + int mHighlightedIndex; + int mLastUsedSlot; + int mTag; + int mSortType; + int mClicks; int mBoxWidth; int mBoxHeight; int mEquippedTextPadding; int mPaddingItemX; int mPaddingItemY; - - typedef std::list SelectionListenerList; - typedef SelectionListenerList::iterator SelectionListenerIterator; - - SelectionListenerList mSelectionListeners; - gcn::Color mEquipedColor; - gcn::Color mEquipedColor2; - gcn::Color mUnEquipedColor; - gcn::Color mUnEquipedColor2; + SelectionState mSelectionStatus; + bool mForceQuantity; + bool mSwapItems; + bool mDescItems; }; #endif // GUI_WIDGETS_ITEMCONTAINER_H -- cgit v1.2.3-60-g2f50