diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-24 16:40:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-24 16:40:21 +0300 |
| commit | 5de322cf706004227fd0ebec59e0ebb50631df3a (patch) | |
| tree | 191303f7a4f4c5364c9713fe44738bd20af65786 /src/gui | |
| parent | d6b7cd3b259512cd28e1b5a82861ef8b11b2b7cb (diff) | |
| download | manaplus-5de322cf706004227fd0ebec59e0ebb50631df3a.tar.gz manaplus-5de322cf706004227fd0ebec59e0ebb50631df3a.tar.bz2 manaplus-5de322cf706004227fd0ebec59e0ebb50631df3a.tar.xz manaplus-5de322cf706004227fd0ebec59e0ebb50631df3a.zip | |
Fix check for opened storage window.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/windows/inventorywindow.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 228f140bf..119de9e94 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -35,6 +35,7 @@ class Button; class DropDown; +class InventoryWindow; class Item; class ItemContainer; class LayoutCell; @@ -43,6 +44,12 @@ class SortListModelInv; class TabStrip; class TextField; +extern InventoryWindow *inventoryWindow; +extern InventoryWindow *storageWindow; +#ifdef EATHENA_SUPPORT +extern InventoryWindow *cartWindow; +#endif // EATHENA_SUPPORT + /** * Inventory dialog. * @@ -132,7 +139,7 @@ class InventoryWindow final : public Window, * Returns true if any instances exist. */ static bool isStorageActive() A_WARN_UNUSED - { return invInstances.size() > 1; } + { return storageWindow; } void updateDropButton(); @@ -200,10 +207,4 @@ class InventoryWindow final : public Window, bool mCompactMode; }; -extern InventoryWindow *inventoryWindow; -extern InventoryWindow *storageWindow; -#ifdef EATHENA_SUPPORT -extern InventoryWindow *cartWindow; -#endif // EATHENA_SUPPORT - #endif // GUI_WINDOWS_INVENTORYWINDOW_H |