Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-07-14 12:25:44 -03:00
parent 5540330295 f6b226ea7e
commit c5860d13d5
86 changed files with 839 additions and 412 deletions
@@ -1462,6 +1462,11 @@ namespace Barotrauma
                }
                else
                {
+                    if (GameMain.NetLobbyScreen.SelectedMode == GameModePreset.MultiPlayerCampaign)
+                    {
+                        MultiPlayerCampaign.StartCampaignSetup();
+                        return;
+                    }
                    if (!GameMain.Server.StartGame()) { NewMessage("Failed to start a new round", Color.Yellow); }
                }
            }));