Revert "Merge WindowContainer into Viewport and remove extra members"

This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.

Conflicts:

	src/gui/gui.cpp
	src/gui/viewport.cpp

1 files changed, 12 insertions, 1 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 8558d421..2b9e932e 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -124,6 +124,7 @@ ChannelManager *channelManager = NULL;
 CommandHandler *commandHandler = NULL;
 Particle *particleEngine = NULL;
 EffectManager *effectManager = NULL;
+Viewport *viewport = NULL;                    /**< Viewport on the map. */
 
 ChatTab *localChatTab = NULL;
 
@@ -216,10 +217,19 @@ 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;
-    viewport->add(mWindowMenu);
+    windowContainer->add(mWindowMenu);
 
     initEngines();
 
@@ -266,6 +276,7 @@ Game::~Game()
     delete commandHandler;
     delete joystick;
     delete particleEngine;
+    delete viewport;
     delete mCurrentMap;
     map_path = "";