summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.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/gui/popupmenu.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/gui/popupmenu.cpp')
-rw-r--r--src/gui/popupmenu.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 9052e9d2..8404fad1 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -33,7 +33,6 @@
#include "gui/chat.h"
#include "gui/inventorywindow.h"
-#include "gui/storagewindow.h"
#include "gui/itemamount.h"
#include "gui/widgets/browserbox.h"
@@ -386,7 +385,7 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split")));
}
- if (StorageWindow::isActive())
+ if (InventoryWindow::isStorageActive())
{
mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store")));
}