More eAthena guild stuff

Also some related chenges elsewhere

4 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index d7e82bd1..e40ac325 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -53,7 +53,7 @@ class InventoryWindow : public Window,
          * Constructor.
          */
         InventoryWindow(int invSize = Net::getInventoryHandler()
-                                      ->getInventorySize());
+                                ->getSize(Net::InventoryHandler::INVENTORY));
 
         /**
          * Destructor.
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index b0ffa3ff..e6583bad 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -197,5 +197,5 @@ void StorageWindow::removeStore(Item *item, int amount)
 
 void StorageWindow::close()
 {
-    Net::getInventoryHandler()->closeStorage();
+    Net::getInventoryHandler()->closeStorage(Net::InventoryHandler::STORAGE);
 }
diff --git a/src/gui/storagewindow.h b/src/gui/storagewindow.h
index 8c890c27..a67e0617 100644
--- a/src/gui/storagewindow.h
+++ b/src/gui/storagewindow.h
@@ -50,7 +50,7 @@ class StorageWindow : public Window, gcn::ActionListener,
          * Constructor.
          */
         StorageWindow(int invSize = Net::getInventoryHandler()
-                                    ->getStorageSize());
+                                    ->getSize(Net::InventoryHandler::STORAGE));
 
         /**
          * Destructor.
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index 15a4d7e8..5a659da9 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -58,9 +58,9 @@
 TradeWindow::TradeWindow():
     Window(_("Trade: You")),
     mMyInventory(new Inventory(Net::getInventoryHandler()
-                               ->getInventorySize())),
+                               ->getSize(Net::InventoryHandler::INVENTORY))),
     mPartnerInventory(new Inventory(Net::getInventoryHandler()
-                                    ->getInventorySize())),
+                               ->getSize(Net::InventoryHandler::INVENTORY))),
     mStatus(PROPOSING)
 {    
     setWindowName("Trade");