From 76b306a5a2eff9f9a6bb65b3d784cc8e31ba6cce Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 1 Mar 2010 20:41:41 -0700
Subject: Simplify BeignPopup and therefore Viewport

---
 src/gui/viewport.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/gui/viewport.cpp')

diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 99053339..a36f91cf 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -58,8 +58,7 @@ Viewport::Viewport():
     mPixelViewY(0.0f),
     mShowDebugPath(false),
     mPlayerFollowMouse(false),
-    mLocalWalkTime(-1),
-    mBeingPopup(0)
+    mLocalWalkTime(-1)
 {
     setOpaque(false);
     addMouseListener(this);
@@ -75,6 +74,7 @@ Viewport::Viewport():
     viewport = this;
 
     mPopupMenu = new PopupMenu;
+    mBeingPopup = new BeingPopup;
 
     setFocusable(true);
 }
@@ -91,9 +91,6 @@ void Viewport::setMap(Map *map)
         map->setDebugFlags(mMap->getDebugFlags());
     }
     mMap = map;
-
-    if (!mBeingPopup)
-        mBeingPopup = new BeingPopup;
 }
 
 extern MiniStatusWindow *miniStatusWindow;
@@ -523,8 +520,7 @@ void Viewport::toggleDebugPath()
 
 void Viewport::hideBeingPopup()
 {
-    if (mBeingPopup)
-        mBeingPopup->setVisible(false);
+    mBeingPopup->setVisible(false);
 }
 
 void Viewport::scheduleDelete(gcn::Widget *widget)
-- 
cgit v1.2.3-70-g09d2