summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-04-09 14:57:27 +0300
committerAndrei Karas <akaras@inbox.ru>2013-04-09 15:59:33 +0300
commitdd4d44a07d3a63ced0eec51c30b75887792c4a36 (patch)
tree26f3da1fd25d91eb8483dc1b819a1d3a3552e6af /src/gui/inventorywindow.h
parent099c67f93cf49cda90be55606e1b744c47624b92 (diff)
downloadmanaverse-dd4d44a07d3a63ced0eec51c30b75887792c4a36.tar.gz
manaverse-dd4d44a07d3a63ced0eec51c30b75887792c4a36.tar.bz2
manaverse-dd4d44a07d3a63ced0eec51c30b75887792c4a36.tar.xz
manaverse-dd4d44a07d3a63ced0eec51c30b75887792c4a36.zip
some more style and cast fixes.
Diffstat (limited to 'src/gui/inventorywindow.h')
-rw-r--r--src/gui/inventorywindow.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 83e26948b..903f15254 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -131,7 +131,7 @@ class InventoryWindow final : public Window,
* Returns true if any instances exist.
*/
static bool isStorageActive() A_WARN_UNUSED
- { return instances.size() > 1; }
+ { return invInstances.size() > 1; }
void updateDropButton();
@@ -154,7 +154,7 @@ class InventoryWindow final : public Window,
typedef std::list<InventoryWindow*> WindowList;
- static WindowList instances;
+ static WindowList invInstances;
Inventory *mInventory;
ItemContainer *mItems;
@@ -169,7 +169,7 @@ class InventoryWindow final : public Window,
Button *mEquipmentButton;
Button *mStoreButton;
Button *mRetrieveButton;
- Button *mCloseButton;
+ Button *mInvCloseButton;
ProgressBar *mWeightBar;
ProgressBar *mSlotsBar;