Merge pull request #1 from Regalis11/master

update my fork
2021-02-10 12:13:12 -03:00
parent 084e47636e 694cdfee7b
commit 0f64196bdb
354 changed files with 12898 additions and 5029 deletions
@@ -1345,7 +1345,15 @@ namespace Barotrauma
            commands.Add(new Command("startgame|startround|start", "start/startgame/startround: Start a new round.", (string[] args) =>
            {
                if (Screen.Selected == GameMain.GameScreen) { return; }
-                if (!GameMain.Server.StartGame()) NewMessage("Failed to start a new round", Color.Yellow);
+                if (GameMain.GameSession?.GameMode is MultiPlayerCampaign mpCampaign && 
+                    GameMain.NetLobbyScreen.SelectedMode == GameModePreset.MultiPlayerCampaign)
+                {
+                    MultiPlayerCampaign.LoadCampaign(GameMain.GameSession.SavePath);
+                }
+                else
+                {
+                    if (!GameMain.Server.StartGame()) { NewMessage("Failed to start a new round", Color.Yellow); }
+                }
            }));

            commands.Add(new Command("endgame|endround|end", "end/endgame/endround: End the current round.", (string[] args) =>