Fixed EndRound music looping forever. Closes #334

2018-04-18 11:02:58 +03:00
parent 9a8f13140e
commit edf5bacc89
5 changed files with 18 additions and 11 deletions
@@ -86,6 +86,8 @@ namespace Barotrauma
            set;
        }

+        public static float? OverrideMusicDuration;
+
        public static int SoundCount;
        
        public static IEnumerable<object> Init()
@@ -278,6 +280,16 @@ namespace Barotrauma
        {
            if (musicClips == null) return;

+            if (OverrideMusicType != null && OverrideMusicDuration.HasValue)
+            {
+                OverrideMusicDuration -= deltaTime;
+                if (OverrideMusicDuration <= 0.0f)
+                {
+                    OverrideMusicType = null;
+                    OverrideMusicDuration = null;
+                }                
+            }
+
            updateMusicTimer -= deltaTime;
            if (updateMusicTimer <= 0.0f)
            {