StateRunning check returns

apps/openmw/engine.cpp

@@ -93,22 +93,30 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         if (mUseSound)
             MWBase::Environment::get().getSoundManager()->update(frametime);
 
-        // global scripts
-        MWBase::Environment::get().getScriptManager()->getGlobalScripts().run();
+        if (MWBase::Environment::get().getStateManager()->getState()==
+            MWBase::StateManager::State_Running)
+        {
+            // global scripts
+            MWBase::Environment::get().getScriptManager()->getGlobalScripts().run();
 
-        bool changed = MWBase::Environment::get().getWorld()->hasCellChanged();
+            bool changed = MWBase::Environment::get().getWorld()->hasCellChanged();
 
-        // local scripts
-        executeLocalScripts(); // This does not handle the case where a global script causes a
-                                // cell change, followed by a cell change in a local script during
-                                // the same frame.
+            // local scripts
+            executeLocalScripts(); // This does not handle the case where a global script causes a
+                                    // cell change, followed by a cell change in a local script during
+                                    // the same frame.
 
-        if (changed) // keep change flag for another frame, if cell changed happened in local script
-            MWBase::Environment::get().getWorld()->markCellAsUnchanged();
+            if (changed) // keep change flag for another frame, if cell changed happened in local script
+                MWBase::Environment::get().getWorld()->markCellAsUnchanged();
+
+            if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
+                MWBase::Environment::get().getWorld()->advanceTime(
+                    frametime*MWBase::Environment::get().getWorld()->getTimeScaleFactor()/3600);
+
+            // update game state
+            MWBase::Environment::get().getStateManager()->update (frametime);
+        }
 
-        if (!MWBase::Environment::get().getWindowManager()->isGuiMode())
-            MWBase::Environment::get().getWorld()->advanceTime(
-                frametime*MWBase::Environment::get().getWorld()->getTimeScaleFactor()/3600);
 
         // update actors
         MWBase::Environment::get().getMechanicsManager()->update(frametime,
@@ -125,9 +133,6 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         // update world
         MWBase::Environment::get().getWorld()->update(frametime, MWBase::Environment::get().getWindowManager()->isGuiMode());
 
-        // update game state
-        MWBase::Environment::get().getStateManager()->update (frametime);
-
         // update GUI
         Ogre::RenderWindow* window = mOgre->getWindow();
         unsigned int tri, batch;