Fade in when shift starts, fixed fadeout canceling before screen is switched to lobby

2016-01-20 23:22:55 +02:00
parent 6f537ebc7c
commit 2761c4a610
5 changed files with 47 additions and 13 deletions
@@ -182,9 +182,6 @@ namespace Barotrauma
        {
            GUI.Init(Content);

-            sw = new Stopwatch();
-
-
            GUIComponent.Init(Window);
            DebugConsole.Init(Window);
            yield return CoroutineStatus.Running;
@@ -338,11 +335,8 @@ namespace Barotrauma
            //{
            //    System.Threading.Thread.Sleep((int)((Physics.step - elapsed) * 1000.0));
            //}
-            sw.Restart();
        }

-        Stopwatch sw;
-
        static bool waitForKeyHit = true;
        public static void ShowLoading(IEnumerable<object> loader, bool waitKeyHit = true)
        {