From b90fc8ad921e89059e7568523a7d15b237152ad9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 14 Jun 2015 18:19:53 +0200
Subject: [PATCH] Fix for various Viewer::frame calls resetting the
 simulationTime

---
 apps/openmw/mwgui/loadingscreen.cpp       | 2 +-
 apps/openmw/mwgui/windowmanagerimp.cpp    | 4 ++--
 apps/openmw/mwrender/renderingmanager.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 774faa003f..7e733686db 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -259,7 +259,7 @@ namespace MWGui
             MWBase::Environment::get().getInputManager()->update(0, true, true);
 
             //osg::Timer timer;
-            mViewer->frame();
+            mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
             //std::cout << "frame took " << timer.time_m() << std::endl;
 
             //if (mViewer->getIncrementalCompileOperation())
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 298d4812e3..515265bd92 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -851,7 +851,7 @@ namespace MWGui
                 mMessageBoxManager->onFrame(0.f);
                 MWBase::Environment::get().getInputManager()->update(0, true, false);
 
-                mViewer->frame();
+                mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
             }
         }
     }
@@ -1744,7 +1744,7 @@ namespace MWGui
         {
             MWBase::Environment::get().getInputManager()->update(0, true, false);
 
-            mViewer->frame();
+            mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
         }
         mVideoWidget->stop();
 
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index c8080cf166..4db776783a 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -432,7 +432,7 @@ namespace MWRender
 
         mRootNode->addChild(rttCamera);
 
-        mViewer->frame();
+        mViewer->frame(mViewer->getFrameStamp()->getSimulationTime());
 
         // The draw needs to complete before we can copy back our image.
         osg::ref_ptr<NotifyDrawCompletedCallback> callback (new NotifyDrawCompletedCallback);