(9c0250ef1) Merge branch 'dev' into human-ai

2019-05-16 05:14:40 +03:00
parent 2ae54a01a5
commit 7f72f72ca7
27 changed files with 348 additions and 343 deletions
@@ -65,11 +65,6 @@ namespace Barotrauma
            endTimer = 5.0f;
            isRunning = true;
            CrewManager.InitSinglePlayerRound();
-
-            if (ContextualTutorial.Initialized)
-            {
-                ContextualTutorial.Start();
-            }
        }

        public bool TryHireCharacter(Location location, CharacterInfo characterInfo)
@@ -175,11 +170,6 @@ namespace Barotrauma

            base.Update(deltaTime);

-            if (ContextualTutorial.Initialized)
-            {
-                ContextualTutorial.Update(deltaTime);
-            }
-
            if (!GUI.DisableHUD && !GUI.DisableUpperHUD)
            {
                endRoundButton.UpdateManually(deltaTime);
@@ -440,12 +430,6 @@ namespace Barotrauma
                new XAttribute("cheatsenabled", CheatsEnabled));
            CrewManager.Save(modeElement);
            Map.Save(modeElement);
-
-            if (ContextualTutorial.Initialized)
-            {
-                ContextualTutorial.SavePartiallyComplete(modeElement);
-            }
-
            element.Add(modeElement);
        }
    }