(b17b66c5f) updated remora and drone

This commit is contained in:
Joonas Rikkonen
2019-05-06 11:35:29 +03:00
parent 7559fc3d7c
commit 26eaf244ed
16 changed files with 68 additions and 336 deletions
@@ -340,6 +340,7 @@ namespace Barotrauma
GUI.Init(Window, Config.SelectedContentPackages, GraphicsDevice);
DebugConsole.Init();
SteamManager.Initialize();
if (Config.AutoUpdateWorkshopItems)
{
if (SteamManager.AutoUpdateWorkshopItems())
@@ -647,10 +648,9 @@ 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)
#if !DEBUG
if (NetworkMember == null && !WindowActive && Config.PauseOnFocusLost)
{
GUI.TogglePauseMenu();
paused = true;
}
#endif