summaryrefslogtreecommitdiff
path: root/src/net/ea/inventoryhandler.cpp
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-03-25 12:18:43 -0600
committerJared Adams <jaxad0127@gmail.com>2010-03-25 12:42:43 -0600
commitf781215c6401343d287798b58b08183e71ef57e3 (patch)
treeb07001f8ee295c4ba8617c5168805269530bd9d1 /src/net/ea/inventoryhandler.cpp
parentbf6cb46d9b06b06470efd5ad3ebae7e274f6906f (diff)
downloadmana-f781215c6401343d287798b58b08183e71ef57e3.tar.gz
mana-f781215c6401343d287798b58b08183e71ef57e3.tar.bz2
mana-f781215c6401343d287798b58b08183e71ef57e3.tar.xz
mana-f781215c6401343d287798b58b08183e71ef57e3.zip
Merge StorageWindow into InventoryWindow
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/net/ea/inventoryhandler.cpp')
-rw-r--r--src/net/ea/inventoryhandler.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 60288ed3..1b191354 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -29,8 +29,6 @@
#include "localplayer.h"
#include "log.h"
-#include "gui/storagewindow.h"
-
#include "gui/widgets/chattab.h"
#include "net/messagein.h"
@@ -308,7 +306,7 @@ void InventoryHandler::handleMessage(Net::MessageIn &msg)
mInventoryItems.clear();
if (!mStorageWindow)
- mStorageWindow = new StorageWindow(mStorage);
+ mStorageWindow = new InventoryWindow(mStorage);
}
break;