(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -129,6 +129,8 @@ namespace Barotrauma
            get { return pauseMenuOpen; }
        }

+        public static bool PreventPauseMenuToggle = false;
+
        public static Color ScreenOverlayColor
        {
            get;
@@ -1413,6 +1415,7 @@ namespace Barotrauma
        public static void TogglePauseMenu()
        {
            if (Screen.Selected == GameMain.MainMenuScreen) return;
+            if (PreventPauseMenuToggle) return;

            settingsMenuOpen = false;

@@ -1546,9 +1549,16 @@ namespace Barotrauma
            
            if (GameMain.GameSession != null)
            {
-                if (ContextualTutorial.Initialized && GameMain.GameSession.GameMode is SinglePlayerCampaign)
+                if (Tutorial.Initialized)
                {
-                    ((SinglePlayerCampaign)GameMain.GameSession.GameMode).ContextualTutorial.Stop();
+                    if (GameMain.GameSession.GameMode is SinglePlayerCampaign)
+                    {
+                        ((SinglePlayerCampaign)GameMain.GameSession.GameMode).ContextualTutorial.Stop();
+                    }
+                    else
+                    {
+                        ((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop();
+                    }
                }

                if (GameSettings.SendUserStatistics)