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, 13 insertions, 0 deletions

diff --git a/src/localplayer.h b/src/localplayer.h
index 69fd4d0f..919b5540 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -391,6 +391,17 @@ class LocalPlayer : public Player
          */
         bool getCheckNameSetting() const { return mUpdateName; }
 
+        /**
+         * Set if the current map is initialized.
+         */
+        void setMapInitialized(bool initialized)
+        { mMapInitialized = initialized; }
+
+        /**
+         * Tells if the current map is initialized.
+         */
+        bool isMapInitialized() const { return mMapInitialized; }
+
         /**  Keeps the Equipment related values */
         const std::auto_ptr<Equipment> mEquipment;
 
@@ -399,6 +410,8 @@ class LocalPlayer : public Player
         /** Whether or not the name settings have changed */
         bool mUpdateName;
 
+        bool mMapInitialized; /**< Whether or not the map is available yet */
+
         virtual void handleStatusEffect(StatusEffect *effect, int effectId);
 
         // Colors don't change for local player