From d70306382eac080677ef6bf3cea7303440a931ea Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 16 May 2014 00:58:12 +0200
Subject: [PATCH] Don't create the player object until the game starts Fixes a
 crash introduced in e591d23 when using --skip-menu=0.

---
 apps/openmw/engine.cpp | 44 +++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 03361408c..66c09b6ff 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -66,9 +66,13 @@ void OMW::Engine::executeLocalScripts()
 
 bool OMW::Engine::frameStarted (const Ogre::FrameEvent& evt)
 {
-    bool paused = MWBase::Environment::get().getWindowManager()->isGuiMode();
-    MWBase::Environment::get().getWorld()->frameStarted(evt.timeSinceLastFrame, paused);
-    MWBase::Environment::get().getWindowManager ()->frameStarted(evt.timeSinceLastFrame);
+    if (MWBase::Environment::get().getStateManager()->getState()!=
+        MWBase::StateManager::State_NoGame)
+    {
+        bool paused = MWBase::Environment::get().getWindowManager()->isGuiMode();
+        MWBase::Environment::get().getWorld()->frameStarted(evt.timeSinceLastFrame, paused);
+        MWBase::Environment::get().getWindowManager ()->frameStarted(evt.timeSinceLastFrame);
+    }
     return true;
 }
 
@@ -110,8 +114,12 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
 
 
         // update actors
-        MWBase::Environment::get().getMechanicsManager()->update(frametime,
-            paused);
+        if (MWBase::Environment::get().getStateManager()->getState()!=
+            MWBase::StateManager::State_NoGame)
+        {
+            MWBase::Environment::get().getMechanicsManager()->update(frametime,
+                paused);
+        }
 
         if (MWBase::Environment::get().getStateManager()->getState()==
             MWBase::StateManager::State_Running)
@@ -122,16 +130,24 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         }
 
         // update world
-        MWBase::Environment::get().getWorld()->update(frametime, paused);
+        if (MWBase::Environment::get().getStateManager()->getState()!=
+            MWBase::StateManager::State_NoGame)
+        {
+            MWBase::Environment::get().getWorld()->update(frametime, paused);
+        }
 
         // update GUI
-        Ogre::RenderWindow* window = mOgre->getWindow();
-        unsigned int tri, batch;
-        MWBase::Environment::get().getWorld()->getTriangleBatchCount(tri, batch);
-        MWBase::Environment::get().getWindowManager()->wmUpdateFps(window->getLastFPS(), tri, batch);
+        if (MWBase::Environment::get().getStateManager()->getState()!=
+            MWBase::StateManager::State_NoGame)
+        {
+            Ogre::RenderWindow* window = mOgre->getWindow();
+            unsigned int tri, batch;
+            MWBase::Environment::get().getWorld()->getTriangleBatchCount(tri, batch);
+            MWBase::Environment::get().getWindowManager()->wmUpdateFps(window->getLastFPS(), tri, batch);
 
-        MWBase::Environment::get().getWindowManager()->onFrame(frametime);
-        MWBase::Environment::get().getWindowManager()->update();
+            MWBase::Environment::get().getWindowManager()->onFrame(frametime);
+            MWBase::Environment::get().getWindowManager()->update();
+        }
     }
     catch (const std::exception& e)
     {
@@ -393,10 +409,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     mEnvironment.setJournal (new MWDialogue::Journal);
     mEnvironment.setDialogueManager (new MWDialogue::DialogueManager (mExtensions, mVerboseScripts, mTranslationDataStorage));
 
-    mEnvironment.getWorld()->renderPlayer();
-    mechanics->buildPlayer();
-    window->updatePlayer();
-
     mOgre->getRoot()->addFrameListener (this);
 
     // scripts