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

Derp: fixed submarine files not being included in saves if the player saves and quits from the single player lobby

Browse Source
This commit is contained in:
Regalis
2017-02-27 21:33:42 +02:00
parent 27a883349c
commit 979c82443c
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Utils/SaveUtil.cs
+17 -5
View File
@@ -28,7 +28,7 @@ namespace Barotrauma
Directory.CreateDirectory(tempPath); Directory.CreateDirectory(tempPath);
try try
{ {
ClearFolder(tempPath); ClearFolder(tempPath, new string[] { GameMain.GameSession.Submarine.FilePath });
} }
catch catch
{ {
@@ -37,7 +37,7 @@ namespace Barotrauma
try try
{ {
if (Submarine.MainSub != null) if (Submarine.MainSub != null && Submarine.Loaded.Contains(Submarine.MainSub))
{ {
Submarine.MainSub.FilePath = Path.Combine(tempPath, Submarine.MainSub.Name + ".sub"); Submarine.MainSub.FilePath = Path.Combine(tempPath, Submarine.MainSub.Name + ".sub");
Submarine.MainSub.SaveAs(Submarine.MainSub.FilePath); Submarine.MainSub.SaveAs(Submarine.MainSub.FilePath);
@@ -77,7 +77,7 @@ namespace Barotrauma
XDocument doc = ToolBox.TryLoadXml(Path.Combine(TempPath, "gamesession.xml")); XDocument doc = ToolBox.TryLoadXml(Path.Combine(TempPath, "gamesession.xml"));
string subPath = Path.Combine(TempPath, ToolBox.GetAttributeString(doc.Root, "submarine", "")); string subPath = Path.Combine(TempPath, ToolBox.GetAttributeString(doc.Root, "submarine", ""))+".sub";
Submarine selectedMap = new Submarine(subPath, "");// Submarine.Load(); Submarine selectedMap = new Submarine(subPath, "");// Submarine.Load();
GameMain.GameSession = new GameSession(selectedMap, fileName, doc); GameMain.GameSession = new GameSession(selectedMap, fileName, doc);
@@ -285,19 +285,31 @@ namespace Barotrauma
while (DecompressFile(sDir, zipStream, progress)) ; while (DecompressFile(sDir, zipStream, progress)) ;
} }
private static void ClearFolder(string FolderName) private static void ClearFolder(string FolderName, string[] ignoredFiles = null)
{ {
DirectoryInfo dir = new DirectoryInfo(FolderName); DirectoryInfo dir = new DirectoryInfo(FolderName);
foreach (FileInfo fi in dir.GetFiles()) foreach (FileInfo fi in dir.GetFiles())
{ {
bool ignore = false;
foreach (string ignoredFile in ignoredFiles)
{
if (Path.GetFullPath(fi.FullName).Equals(Path.GetFullPath(ignoredFile)))
{
ignore = true;
break;
}
}
if (ignore) continue;
fi.IsReadOnly = false; fi.IsReadOnly = false;
fi.Delete(); fi.Delete();
} }
foreach (DirectoryInfo di in dir.GetDirectories()) foreach (DirectoryInfo di in dir.GetDirectories())
{ {
ClearFolder(di.FullName); ClearFolder(di.FullName, ignoredFiles);
di.Delete(); di.Delete();
} }
} }