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

2024-10-22 12:42:35 -03:00
parent 3e4b649162 a29662c074
commit 30a8f0c561
417 changed files with 17171 additions and 5895 deletions
@@ -785,7 +785,7 @@ namespace Barotrauma
                            {
                                try
                                {
-                                    SaveUtil.LoadGame(saveFiles.OrderBy(file => file.SaveTime).Last().FilePath);
+                                    SaveUtil.LoadGame(CampaignDataPath.CreateRegular(saveFiles.OrderBy(file => file.SaveTime).Last().FilePath));
                                }
                                catch (Exception e)
                                {
@@ -1155,7 +1155,7 @@ namespace Barotrauma
                }
                GameSession.Campaign?.End();
                
-                SaveUtil.SaveGame(GameSession.SavePath);
+                SaveUtil.SaveGame(GameSession.DataPath);
            }

            if (Client != null)