diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-25 12:18:43 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-25 12:42:43 -0600 |
| commit | f781215c6401343d287798b58b08183e71ef57e3 (patch) | |
| tree | b07001f8ee295c4ba8617c5168805269530bd9d1 /src/net | |
| parent | bf6cb46d9b06b06470efd5ad3ebae7e274f6906f (diff) | |
| download | mana-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')
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.h | 4 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 1 |
3 files changed, 3 insertions, 6 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; diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 2699e584..d08e4772 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -26,7 +26,7 @@ #include "inventory.h" #include "localplayer.h" -#include "gui/storagewindow.h" +#include "gui/inventorywindow.h" #include "net/inventoryhandler.h" #include "net/net.h" @@ -151,7 +151,7 @@ class InventoryHandler : public MessageHandler, public Net::InventoryHandler EquipBackend mEquips; InventoryItems mInventoryItems; Inventory *mStorage; - StorageWindow *mStorageWindow; + InventoryWindow *mStorageWindow; }; } // namespace EAthena diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 89e55f92..6aeb5168 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -34,7 +34,6 @@ #include "gui/okdialog.h" #include "gui/sell.h" #include "gui/statuswindow.h" -#include "gui/storagewindow.h" #include "gui/viewport.h" #include "gui/widgets/chattab.h" |