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

Unstable v0.1300.0.0 (February 19th 2021)

Browse Source
This commit is contained in:
Joonas Rikkonen
2021-02-25 13:44:23 +02:00
parent b772654326
commit 24cbef485a
441 changed files with 21343 additions and 8562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs
+20 -7
View File
@@ -108,8 +108,11 @@ namespace Barotrauma
{
if (hash == null)
{
XDocument doc = OpenFile(FilePath);
StartHashDocTask(doc);
if (hashTask == null)
{
XDocument doc = OpenFile(FilePath);
StartHashDocTask(doc);
}
hashTask.Wait();
hashTask = null;
}
@@ -118,6 +121,11 @@ namespace Barotrauma
}
}
public bool CalculatingHash
{
get { return hashTask != null && !hashTask.IsCompleted; }
}
public Vector2 Dimensions
{
get;
@@ -373,6 +381,10 @@ namespace Barotrauma
public void Dispose()
{
#if CLIENT
PreviewImage?.Remove();
PreviewImage = null;
#endif
if (savedSubmarines.Contains(this)) { savedSubmarines.Remove(this); }
}
@@ -522,12 +534,13 @@ namespace Barotrauma
for (int i = savedSubmarines.Count - 1; i >= 0; i--)
{
if (File.Exists(savedSubmarines[i].FilePath) &&
savedSubmarines[i].LastModifiedTime == File.GetLastWriteTime(savedSubmarines[i].FilePath) &&
(Path.GetFullPath(Path.GetDirectoryName(savedSubmarines[i].FilePath)) == Path.GetFullPath(SavePath) ||
contentPackageSubs.Any(fp => Path.GetFullPath(fp.Path).CleanUpPath() == Path.GetFullPath(savedSubmarines[i].FilePath).CleanUpPath())))
if (File.Exists(savedSubmarines[i].FilePath))
{
continue;
bool isDownloadedSub = Path.GetFullPath(Path.GetDirectoryName(savedSubmarines[i].FilePath)) == Path.GetFullPath(SaveUtil.SubmarineDownloadFolder);
bool isInSubmarinesFolder = Path.GetFullPath(Path.GetDirectoryName(savedSubmarines[i].FilePath)) == Path.GetFullPath(SavePath);
bool isInContentPackage = contentPackageSubs.Any(fp => Path.GetFullPath(fp.Path).CleanUpPath() == Path.GetFullPath(savedSubmarines[i].FilePath).CleanUpPath());
if (isDownloadedSub) { continue; }
if (savedSubmarines[i].LastModifiedTime == File.GetLastWriteTime(savedSubmarines[i].FilePath) && (isInSubmarinesFolder || isInContentPackage)) { continue; }
}
savedSubmarines[i].Dispose();
}