summaryrefslogtreecommitdiff
path: root/src/gui/viewport.cpp
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-08-30 21:09:04 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-08-30 21:09:04 +0200
commit5d00678217e5198cb375b4a2214a3e056151bdd9 (patch)
tree1874f2e8fa941f091e34c2b703c923e89f8a01f5 /src/gui/viewport.cpp
parent19f6ce87e69b42fb69a4739ce363e1346cd569ea (diff)
parent4ab9c3f14340910e77856a9e12779ee8c6b9be4d (diff)
downloadmana-client-5d00678217e5198cb375b4a2214a3e056151bdd9.tar.gz
mana-client-5d00678217e5198cb375b4a2214a3e056151bdd9.tar.bz2
mana-client-5d00678217e5198cb375b4a2214a3e056151bdd9.tar.xz
mana-client-5d00678217e5198cb375b4a2214a3e056151bdd9.zip
Merge branch 'equipment-fix'
Diffstat (limited to 'src/gui/viewport.cpp')
-rw-r--r--src/gui/viewport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 0353fd44..945be7de 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -530,9 +530,9 @@ void Viewport::mouseReleased(gcn::MouseEvent &event)
}
void Viewport::showPopup(Window *parent, int x, int y, Item *item,
- bool isInventory)
+ bool isInventory, bool canDrop)
{
- mPopupMenu->showPopup(parent, x, y, item, isInventory);
+ mPopupMenu->showPopup(parent, x, y, item, isInventory, canDrop);
}
void Viewport::closePopupMenu()