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

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:14:40 +03:00
parent 2ae54a01a5
commit 7f72f72ca7
27 changed files with 348 additions and 343 deletions
@@ -1551,14 +1551,7 @@ namespace Barotrauma
{
if (Tutorial.Initialized)
{
if (GameMain.GameSession.GameMode is SinglePlayerCampaign)
{
((SinglePlayerCampaign)GameMain.GameSession.GameMode).ContextualTutorial.Stop();
}
else
{
((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop();
}
((TutorialMode)GameMain.GameSession.GameMode).Tutorial.Stop();
}
if (GameSettings.SendUserStatistics)