(2402e736e) Tester's build, January 25th 2020

2020-01-25 12:48:13 +02:00
parent 4a58987eae
commit eaa18a20a3
57 changed files with 710 additions and 139 deletions
@@ -244,6 +244,7 @@ namespace Barotrauma

        private IEnumerable<object> WaitForCampaignSetup()
        {
+            GUI.SetCursorWaiting();
            string headerText = TextManager.Get("CampaignStartingPleaseWait");
            var msgBox = new GUIMessageBox(headerText, TextManager.Get("CampaignStarting"), new string[] { TextManager.Get("Cancel") });

@@ -251,6 +252,7 @@ namespace Barotrauma
            {
                GameMain.NetLobbyScreen.HighlightMode(GameMain.NetLobbyScreen.SelectedModeIndex);
                GameMain.NetLobbyScreen.SelectMode(GameMain.NetLobbyScreen.SelectedModeIndex);
+                GUI.ClearCursorWait();
                CoroutineManager.StopCoroutines("WaitForCampaignSetup");
                return true;
            };
@@ -263,6 +265,7 @@ namespace Barotrauma
                yield return CoroutineStatus.Running;
            }
            msgBox.Close();
+            GUI.ClearCursorWait();
            yield return CoroutineStatus.Success;
        }