(2a4bd39c2) Merge branch 'dev' into human-ai

2019-05-16 05:33:13 +03:00
parent a3db11876b
commit e367f900b8
54 changed files with 1092 additions and 297 deletions
@@ -340,7 +340,6 @@ namespace Barotrauma
            GUI.Init(Window, Config.SelectedContentPackages, GraphicsDevice);
            DebugConsole.Init();

-            SteamManager.Initialize();
            if (Config.AutoUpdateWorkshopItems)
            {
                if (SteamManager.AutoUpdateWorkshopItems())
@@ -648,6 +647,14 @@ namespace Barotrauma
                    paused = (DebugConsole.IsOpen || GUI.PauseMenuOpen || GUI.SettingsMenuOpen || Tutorial.ContentRunning) &&
                             (NetworkMember == null || !NetworkMember.GameStarted);

+#if !DEBUG || true
+                    if (NetworkMember == null && !WindowActive && !paused && true && Screen.Selected != MainMenuScreen)
+                    {
+                        GUI.TogglePauseMenu();
+                        paused = true;
+                    }
+#endif
+
                    Screen.Selected.AddToGUIUpdateList();

                    if (Client != null)