Unstable 0.16.0.0

2022-01-14 01:28:24 +09:00
parent d9baeaa2e1
commit 7d6421a548
237 changed files with 6430 additions and 2205 deletions
@@ -437,8 +437,8 @@ namespace Barotrauma
                TaskPool.Add("AutoUpdateWorkshopItemsAsync",
                    SteamManager.AutoUpdateWorkshopItemsAsync(), (task) =>
                {
-                    bool result = ((Task<bool>)task).Result;
-
+                    if (!task.TryGetResult(out bool result)) { return; }
+                    
                    Config.WaitingForAutoUpdate = false;
                });

@@ -756,7 +756,10 @@ namespace Barotrauma
                    }

 #if DEBUG
-                    CancelQuickStart |= PlayerInput.KeyDown(Keys.LeftShift);
+                    if (PlayerInput.KeyHit(Keys.LeftShift))
+                    {
+                        CancelQuickStart = !CancelQuickStart;
+                    }

                    if (TitleScreen.LoadState >= 100.0f && !TitleScreen.PlayingSplashScreen && (Config.AutomaticQuickStartEnabled || Config.AutomaticCampaignLoadEnabled || Config.TestScreenEnabled) && FirstLoad && !CancelQuickStart)
                    {