summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/popupmenu.cpp')
-rw-r--r--src/gui/popupmenu.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index e9c71496..7e4bfd65 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -320,8 +320,8 @@ void PopupMenu::handleLink(const std::string &link)
else if (link == "retrieve")
{
- ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove,
- storageWindow, mItem);
+ ItemAmountWindow::showWindow(ItemAmountWindow::StoreRemove, mWindow,
+ mItem);
}
else if (link == "party" && being && being->getType() == Being::PLAYER)
@@ -356,10 +356,12 @@ void PopupMenu::handleLink(const std::string &link)
mItem = NULL;
}
-void PopupMenu::showPopup(int x, int y, Item *item, bool isInventory)
+void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
+ bool isInventory)
{
assert(item);
mItem = item;
+ mWindow = parent;
mBrowserBox->clearRows();
if (isInventory)
@@ -384,7 +386,7 @@ void PopupMenu::showPopup(int x, int y, Item *item, bool isInventory)
mBrowserBox->addRow(strprintf("@@split|%s@@", _("Split")));
}
- if (player_node->getInStorage())
+ if (StorageWindow::isActive())
{
mBrowserBox->addRow(strprintf("@@store|%s@@", _("Store")));
}