From 3fa1e7ebafc090727eb7da1410b44de863c74bd9 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 28 Jun 2020 13:49:05 +0200
Subject: [PATCH] Make time passed SoundManager field

---
 apps/openmw/mwsound/soundmanagerimp.cpp | 12 ++++++------
 apps/openmw/mwsound/soundmanagerimp.hpp |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index a1eb59bac..42c8d9065 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -32,6 +32,8 @@ namespace MWSound
 {
     namespace
     {
+        constexpr float sMinUpdateInterval = 1.0f / 30.0f;
+
         WaterSoundUpdaterSettings makeWaterSoundUpdaterSettings()
         {
             WaterSoundUpdaterSettings settings;
@@ -946,13 +948,11 @@ namespace MWSound
             mSaySoundsQueue.erase(queuesayiter++);
         }
 
-        static float timePassed = 0.0;
-
-        timePassed += duration;
-        if(timePassed < (1.0f/30.0f))
+        mTimePassed += duration;
+        if (mTimePassed < sMinUpdateInterval)
             return;
-        duration = timePassed;
-        timePassed = 0.0f;
+        duration = mTimePassed;
+        mTimePassed = 0.0f;
 
         // Make sure music is still playing
         if(!isMusicPlaying() && !mCurrentPlaylist.empty())
diff --git a/apps/openmw/mwsound/soundmanagerimp.hpp b/apps/openmw/mwsound/soundmanagerimp.hpp
index c79f9abe5..b3d43dc88 100644
--- a/apps/openmw/mwsound/soundmanagerimp.hpp
+++ b/apps/openmw/mwsound/soundmanagerimp.hpp
@@ -114,6 +114,8 @@ namespace MWSound
 
         RegionSoundSelector mRegionSoundSelector;
 
+        float mTimePassed = 0;
+
         Sound_Buffer *insertSound(const std::string &soundId, const ESM::Sound *sound);
 
         Sound_Buffer *lookupSound(const std::string &soundId) const;