(12d32b875) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-26 11:25:25 +03:00
parent 3eb883fbb3
commit 2aec2414be
17 changed files with 170 additions and 77 deletions
@@ -397,6 +397,12 @@ namespace Barotrauma
                switch (selectedTab)
                {
                    case Tab.NewGame:
+                        if (!GameMain.Config.CampaignDisclaimerShown)
+                        {
+                            selectedTab = 0;
+                            GameMain.Instance.ShowCampaignDisclaimer(() => { SelectTab(null, Tab.NewGame); });
+                            return true;
+                        }
                        campaignSetupUI.CreateDefaultSaveName();
                        campaignSetupUI.RandomizeSeed();
                        campaignSetupUI.UpdateSubList(Submarine.SavedSubmarines);
@@ -415,6 +421,12 @@ namespace Barotrauma
                    case Tab.HostServer:
                        break;
                    case Tab.Tutorials:
+                        if (!GameMain.Config.CampaignDisclaimerShown)
+                        {
+                            selectedTab = 0;
+                            GameMain.Instance.ShowCampaignDisclaimer(() => { SelectTab(null, Tab.Tutorials); });
+                            return true;
+                        }
                        UpdateTutorialList();
                        break;
                    case Tab.CharacterEditor: