(04efc4310) Fixed splash screens playing after loading screen is closed + fixed splash screens getting skipped while out of focus

2019-06-04 16:42:18 +03:00
parent 3393cb7a1b
commit d1ca8f1fb8
3 changed files with 2 additions and 180 deletions
@@ -610,7 +610,7 @@ namespace Barotrauma
                    // -> no pause caused by leftover time in the accumulator when starting a new shift
                    GameMain.ResetFrameTime();

-                    if (TitleScreen.LoadState >= 100.0f &&
+                    if (TitleScreen.LoadState >= 100.0f && !TitleScreen.PlayingSplashScreen &&
                        (!waitForKeyHit || ((PlayerInput.GetKeyboardState.GetPressedKeys().Length > 0 || PlayerInput.LeftButtonClicked()) && WindowActive)))
                    {
                        loadingScreenOpen = false;