Merged 0.0 changes from revision 3362 to 3580 to trunk.

1 files changed, 4 insertions, 21 deletions

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2af1d960..4c6b04a2 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -55,8 +55,7 @@ Viewport::Viewport():
     mCameraX(0),
     mCameraY(0),
     mShowDebugPath(false),
-    mPlayerFollowMouse(false),
-    mPopupActive(false)
+    mPlayerFollowMouse(false)
 {
     setOpaque(false);
     addMouseListener(this);
@@ -372,21 +371,20 @@ Viewport::mousePressed(gcn::MouseEvent &event)
         if ((being = beingManager->findBeing(tilex, tiley)) &&
                 being->getType() != Being::LOCALPLAYER)
         {
-            showPopup(event.getX(), event.getY(), being);
+            mPopupMenu->showPopup(event.getX(), event.getY(), being);
             return;
         }
         else if((floorItem = floorItemManager->findByCoordinates(tilex, tiley)))
         {
-            showPopup(event.getX(), event.getY(), floorItem);
+            mPopupMenu->showPopup(event.getX(), event.getY(), floorItem);
             return;
         }
     }
 
     // If a popup is active, just remove it
-    if (mPopupActive)
+    if (mPopupMenu->isVisible())
     {
         mPopupMenu->setVisible(false);
-        mPopupActive = false;
         return;
     }
 
@@ -450,21 +448,6 @@ void
 Viewport::showPopup(int x, int y, Item *item)
 {
     mPopupMenu->showPopup(x, y, item);
-    mPopupActive = true;
-}
-
-void
-Viewport::showPopup(int x, int y, FloorItem *floorItem)
-{
-    mPopupMenu->showPopup(x, y, floorItem);
-    mPopupActive = true;
-}
-
-void
-Viewport::showPopup(int x, int y, Being *being)
-{
-    mPopupMenu->showPopup(x, y, being);
-    mPopupActive = true;
 }
 
 void