Merge remote-tracking branch 'upstream/master' into develop

2024-06-18 12:19:13 -03:00
parent 60d0a8d453 230d1b6e78
commit e163f7ed73
263 changed files with 7788 additions and 2849 deletions
@@ -1147,19 +1147,14 @@ namespace Barotrauma
            if (save)
            {
                GUI.SetSavingIndicatorState(true);
+
+                GameSession.Campaign?.HandleSaveAndQuit();
                if (GameSession.Submarine != null && !GameSession.Submarine.Removed)
                {
                    GameSession.SubmarineInfo = new SubmarineInfo(GameSession.Submarine);
                }
-                if (GameSession.Campaign is CampaignMode campaign)
-                {
-                    if (campaign is SinglePlayerCampaign spCampaign && Level.IsLoadedFriendlyOutpost)
-                    {
-                        spCampaign.UpdateStoreStock();
-                    }
-                    GameSession.EventManager?.RegisterEventHistory(registerFinishedOnly: true);
-                    campaign.End();
-                }
+                GameSession.Campaign?.End();
+                
                SaveUtil.SaveGame(GameSession.SavePath);
            }