Merge WindowContainer into Viewport and remove extra members

Reviewed-by: Chuck Miller

1 files changed, 1 insertions, 12 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 2b9e932e..8558d421 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -124,7 +124,6 @@ ChannelManager *channelManager = NULL;
 CommandHandler *commandHandler = NULL;
 Particle *particleEngine = NULL;
 EffectManager *effectManager = NULL;
-Viewport *viewport = NULL;                    /**< Viewport on the map. */
 
 ChatTab *localChatTab = NULL;
 
@@ -217,19 +216,10 @@ Game::Game():
 
     disconnectedDialog = NULL;
 
-    // Create the viewport
-    viewport = new Viewport;
-    viewport->setDimension(gcn::Rectangle(0, 0, graphics->getWidth(),
-                                          graphics->getHeight()));
-
-    gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
-    top->add(viewport);
-    viewport->requestMoveToBottom();
-
     createGuiWindows();
 
     mWindowMenu = new WindowMenu;
-    windowContainer->add(mWindowMenu);
+    viewport->add(mWindowMenu);
 
     initEngines();
 
@@ -276,7 +266,6 @@ Game::~Game()
     delete commandHandler;
     delete joystick;
     delete particleEngine;
-    delete viewport;
     delete mCurrentMap;
     map_path = "";