From a4737d84178e0f7ae58ed9364d648d1e9c4c687f Mon Sep 17 00:00:00 2001
From: scrawl <720642+scrawl@users.noreply.github.com>
Date: Wed, 4 Oct 2017 17:26:23 +0200
Subject: [PATCH] Use MyGUI frame events for ScreenFader

---
 apps/openmw/mwgui/screenfader.cpp      | 10 +++++++++-
 apps/openmw/mwgui/screenfader.hpp      |  3 ++-
 apps/openmw/mwgui/windowmanagerimp.cpp |  6 ------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index d1118848b..9a9a1ae01 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -2,6 +2,7 @@
 
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_ImageBox.h>
+#include <MyGUI_Gui.h>
 
 namespace MWGui
 {
@@ -80,6 +81,8 @@ namespace MWGui
         , mFactor(1.f)
         , mRepeat(false)
     {
+        MyGUI::Gui::getInstance().eventFrameStart += MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
+
         mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());
 
         MyGUI::ImageBox* imageBox = mMainWidget->castType<MyGUI::ImageBox>(false);
@@ -94,7 +97,12 @@ namespace MWGui
         }
     }
 
-    void ScreenFader::update(float dt)
+    ScreenFader::~ScreenFader()
+    {
+        MyGUI::Gui::getInstance().eventFrameStart -= MyGUI::newDelegate(this, &ScreenFader::onFrameStart);
+    }
+
+    void ScreenFader::onFrameStart(float dt)
     {
         if (!mQueue.empty())
         {
diff --git a/apps/openmw/mwgui/screenfader.hpp b/apps/openmw/mwgui/screenfader.hpp
index 88dd0c57b..79bea30e5 100644
--- a/apps/openmw/mwgui/screenfader.hpp
+++ b/apps/openmw/mwgui/screenfader.hpp
@@ -36,8 +36,9 @@ namespace MWGui
     {
     public:
         ScreenFader(const std::string & texturePath, const std::string& layout = "openmw_screen_fader.layout", const MyGUI::FloatCoord& texCoordOverride = MyGUI::FloatCoord(0,0,1,1));
+        ~ScreenFader();
 
-        void update(float dt);
+        void onFrameStart(float dt);
 
         void fadeIn(const float time, float delay=0);
         void fadeOut(const float time, float delay=0);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index eae706ec3..504bef964 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -894,12 +894,6 @@ namespace MWGui
 
         mHud->onFrame(frameDuration);
 
-        if (mWerewolfFader)
-            mWerewolfFader->update(frameDuration);
-        mBlindnessFader->update(frameDuration);
-        mHitFader->update(frameDuration);
-        mScreenFader->update(frameDuration);
-
         mDebugWindow->onFrame(frameDuration);
 
         if (mCharGen)