vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Campaign saving fixes

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-09-03 13:08:10 +03:00
parent 1e41abadd1
commit 3feee93c53
9 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/GUI/GUI.cs
+1 -1
View File
@@ -196,7 +196,7 @@ namespace Barotrauma
{
if (button.UserData as string == "save")
{
SaveUtil.SaveGame(GameMain.GameSession.SaveFile);
SaveUtil.SaveGame(GameMain.GameSession.SavePath);
}
if (GameMain.NetworkMember != null)
Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerCampaign.cs
+2 -2
View File
@@ -58,7 +58,7 @@ namespace Barotrauma
if (!savedOnStart)
{
SaveUtil.SaveGame(GameMain.GameSession.SaveFile);
SaveUtil.SaveGame(GameMain.GameSession.SavePath);
savedOnStart = true;
}
@@ -205,7 +205,7 @@ namespace Barotrauma
Map.MoveToNextLocation();
}
SaveUtil.SaveGame(GameMain.GameSession.SaveFile);
SaveUtil.SaveGame(GameMain.GameSession.SavePath);
}
Barotrauma/BarotraumaClient/Source/GameSession/GameSession.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace Barotrauma
{
Submarine.Unload();
SaveUtil.LoadGame(saveFile);
SaveUtil.LoadGame(savePath);
GameMain.LobbyScreen.Select();
Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs
+4 -2
View File
@@ -71,7 +71,8 @@ namespace Barotrauma
return false;
}
StartNewGame?.Invoke(selectedSub, saveNameBox.Text, seedBox.Text);
string savePath = SaveUtil.CreateSavePath(isMultiplayer ? SaveUtil.SaveType.Multiplayer : SaveUtil.SaveType.Singleplayer, saveNameBox.Text);
StartNewGame?.Invoke(selectedSub, savePath, seedBox.Text);
return true;
};
@@ -81,7 +82,8 @@ namespace Barotrauma
public void CreateDefaultSaveName()
{
saveNameBox.Text = SaveUtil.CreateSavePath();
string savePath = SaveUtil.CreateSavePath(isMultiplayer ? SaveUtil.SaveType.Multiplayer : SaveUtil.SaveType.Singleplayer);
saveNameBox.Text = Path.GetFileNameWithoutExtension(savePath);
}
public void UpdateSubList()
Barotrauma/BarotraumaClient/Source/Screens/LobbyScreen.cs
+5 -7
View File
@@ -76,13 +76,11 @@ namespace Barotrauma
}
locationTitle.Text = "Location: " + campaign.Map.CurrentLocation.Name;
if (campaignUI == null)
{
campaignUI = new CampaignUI(campaign, bottomPanel);
campaignUI.StartRound = StartRound;
campaignUI.OnLocationSelected = SelectLocation;
}
bottomPanel.ClearChildren();
campaignUI = new CampaignUI(campaign, bottomPanel);
campaignUI.StartRound = StartRound;
campaignUI.OnLocationSelected = SelectLocation;
campaignUI.UpdateCharacterLists();
}