From f19973450f4ed6fddece051a11522d8ac1f7bad4 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 16 Nov 2013 11:07:23 +0100
Subject: [PATCH] moved exit game flag from Environment to StateManager

---
 apps/openmw/engine.cpp                  |  2 +-
 apps/openmw/mwbase/environment.cpp      |  1 -
 apps/openmw/mwbase/environment.hpp      |  5 -----
 apps/openmw/mwbase/statemanager.hpp     |  4 ++++
 apps/openmw/mwgui/mainmenu.cpp          |  5 ++---
 apps/openmw/mwinput/inputmanagerimp.cpp |  3 ++-
 apps/openmw/mwstate/statemanagerimp.cpp | 11 +++++++++++
 apps/openmw/mwstate/statemanagerimp.hpp |  5 +++++
 8 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f900e6cb4..d11e72f75 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -487,7 +487,7 @@ void OMW::Engine::go()
         MWBase::Environment::get().getWindowManager()->executeInConsole (mStartupScript);
 
     // Start the main rendering loop
-    while (!mEnvironment.getRequestExit())
+    while (!mEnvironment.get().getStateManager()->hasQuitRequest())
         Ogre::Root::getSingleton().renderOneFrame();
 
     // Save user settings
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index 4a629743f..052bba9ab 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -14,7 +14,6 @@
 #include "statemanager.hpp"
 
 MWBase::Environment *MWBase::Environment::sThis = 0;
-bool MWBase::Environment::sExit = false;
 
 MWBase::Environment::Environment()
 : mWorld (0), mSoundManager (0), mScriptManager (0), mWindowManager (0),
diff --git a/apps/openmw/mwbase/environment.hpp b/apps/openmw/mwbase/environment.hpp
index d7c63601f..eb636ea2f 100644
--- a/apps/openmw/mwbase/environment.hpp
+++ b/apps/openmw/mwbase/environment.hpp
@@ -34,8 +34,6 @@ namespace MWBase
             StateManager *mStateManager;
             float mFrameDuration;
 
-            static bool sExit;
-
             Environment (const Environment&);
             ///< not implemented
 
@@ -48,9 +46,6 @@ namespace MWBase
 
             ~Environment();
 
-            static void setRequestExit () { sExit = true; }
-            static bool getRequestExit () { return sExit; }
-
             void setWorld (World *world);
 
             void setSoundManager (SoundManager *soundManager);
diff --git a/apps/openmw/mwbase/statemanager.hpp b/apps/openmw/mwbase/statemanager.hpp
index 42b1dcc81..e90687293 100644
--- a/apps/openmw/mwbase/statemanager.hpp
+++ b/apps/openmw/mwbase/statemanager.hpp
@@ -19,6 +19,10 @@ namespace MWBase
             StateManager() {}
 
             virtual ~StateManager() {}
+
+            virtual void requestQuit() = 0;
+
+            virtual bool hasQuitRequest() const = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index 95753f540..a58a3d0eb 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -1,13 +1,12 @@
 #include "mainmenu.hpp"
 
-#include <OgreRoot.h>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/journal.hpp"
 #include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/statemanager.hpp"
 
 #include "savegamedialog.hpp"
 
@@ -79,7 +78,7 @@ namespace MWGui
         else if (sender == mButtons["options"])
             MWBase::Environment::get().getWindowManager ()->pushGuiMode (GM_Settings);
         else if (sender == mButtons["exitgame"])
-            MWBase::Environment::get().setRequestExit();
+            MWBase::Environment::get().getStateManager()->requestQuit();
         else if (sender == mButtons["newgame"])
         {
             MWBase::Environment::get().getWorld()->startNewGame();
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 35487e339..c25e9ce52 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -19,6 +19,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
+#include "../mwbase/statemanager.hpp"
 #include "../mwgui/bookwindow.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
@@ -644,7 +645,7 @@ namespace MWInput
 
     void InputManager::windowClosed()
     {
-        MWBase::Environment::setRequestExit();
+        MWBase::Environment::get().getStateManager()->requestQuit();
     }
 
     void InputManager::toggleMainMenu()
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index fa8289419..f5e71d0ce 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -2,6 +2,17 @@
 #include "statemanagerimp.hpp"
 
 MWState::StateManager::StateManager()
+: mQuitRequest (false)
 {
 
+}
+
+void MWState::StateManager::requestQuit()
+{
+    mQuitRequest = true;
+}
+
+bool MWState::StateManager::hasQuitRequest() const
+{
+    return mQuitRequest;
 }
\ No newline at end of file
diff --git a/apps/openmw/mwstate/statemanagerimp.hpp b/apps/openmw/mwstate/statemanagerimp.hpp
index 73cb0a86f..271403ce5 100644
--- a/apps/openmw/mwstate/statemanagerimp.hpp
+++ b/apps/openmw/mwstate/statemanagerimp.hpp
@@ -7,10 +7,15 @@ namespace MWState
 {
     class StateManager : public MWBase::StateManager
     {
+            bool mQuitRequest;
+
         public:
 
             StateManager();
 
+            virtual void requestQuit();
+
+            virtual bool hasQuitRequest() const;
     };
 }