From f781215c6401343d287798b58b08183e71ef57e3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Thu, 25 Mar 2010 12:18:43 -0600 Subject: Merge StorageWindow into InventoryWindow Reviewed-by: Chuck Miller --- src/gui/itemamount.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/gui/itemamount.cpp') diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp index 1dc5425f..f28bbed7 100644 --- a/src/gui/itemamount.cpp +++ b/src/gui/itemamount.cpp @@ -24,7 +24,6 @@ #include "item.h" #include "keyboardconfig.h" -#include "gui/storagewindow.h" #include "gui/trade.h" #include "gui/itempopup.h" #include "gui/viewport.h" @@ -54,10 +53,14 @@ void ItemAmountWindow::finish(Item *item, int amount, Usage usage) Net::getInventoryHandler()->splitItem(item, amount); break; case StoreAdd: - StorageWindow::addStore(item, amount); + Net::getInventoryHandler()->moveItem(Net::InventoryHandler::INVENTORY, + item->getInvIndex(), amount, + Net::InventoryHandler::STORAGE); break; case StoreRemove: - StorageWindow::removeStore(item, amount); + Net::getInventoryHandler()->moveItem(Net::InventoryHandler::STORAGE, + item->getInvIndex(), amount, + Net::InventoryHandler::INVENTORY); break; default: break; -- cgit v1.2.3-70-g09d2