From 5a65e3c7b85ded57be800400ca5376fe4eb5d8f3 Mon Sep 17 00:00:00 2001 From: chacha <> Date: Wed, 24 Apr 2024 14:17:28 +0200 Subject: [PATCH] fix coding style --- OpenRA.Game/Map/MapCache.cs | 6 ++++-- OpenRA.Game/Map/MapPreview.cs | 29 +++++++++++++++++------------ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/OpenRA.Game/Map/MapCache.cs b/OpenRA.Game/Map/MapCache.cs index ce135922a1..3309b85436 100644 --- a/OpenRA.Game/Map/MapCache.cs +++ b/OpenRA.Game/Map/MapCache.cs @@ -151,12 +151,13 @@ namespace OpenRA using (new PerfTimer(map)) { mapPackage = package.OpenPackage(map, modData.ModFiles); - Log.Write("debug",$"Loading Map: {map} FROM {mapPackage.Name}"); + Log.Write("debug", $"Loading Map: {map} FROM {mapPackage.Name}"); Console.WriteLine($"Loading Map: {map} FROM {mapPackage.Name}"); if (mapPackage != null) { var uid = Map.ComputeUID(mapPackage); previews[uid].UpdateFromMap(mapPackage, package, classification, modData.Manifest.MapCompatibility, mapGrid.Type, modDataRules); + // Freeing the package to save memory if there is a lot of Maps previews[uid].PackageDispose(); @@ -181,7 +182,7 @@ namespace OpenRA Log.Write("debug", "Details:"); Log.Write("debug", e); Log.Write("debug", "StackTrace:"); - Log.Write("debug",System.Environment.StackTrace); + Log.Write("debug", System.Environment.StackTrace); } } @@ -292,6 +293,7 @@ namespace OpenRA void LoadAsyncInternal() { Log.Write("debug", "MapCache.LoadAsyncInternal started"); + // Milliseconds to wait on one loop when nothing to do const int EmptyDelay = 50; diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs index bb250eadf3..04f9873772 100644 --- a/OpenRA.Game/Map/MapPreview.cs +++ b/OpenRA.Game/Map/MapPreview.cs @@ -175,19 +175,22 @@ namespace OpenRA public readonly string Uid; public string PackageName { get; private set; } - private IReadOnlyPackage _Package = null; - public IReadOnlyPackage Package { - get { - if (_Package == null) + IReadOnlyPackage pPackage; + public IReadOnlyPackage Package + { + get + { + if (pPackage == null) { - _Package = parentPackage.OpenPackage(PackageName, modData.ModFiles); + pPackage = parentPackage.OpenPackage(PackageName, modData.ModFiles); } - return _Package; - } - private set { - _Package = value; + + return pPackage; } + + private set => pPackage = value; } + IReadOnlyPackage parentPackage; volatile InnerData innerData; @@ -271,6 +274,7 @@ namespace OpenRA { this.cache = cache; this.modData = modData; + this.pPackage = null; Uid = uid; innerData = new InnerData @@ -297,6 +301,7 @@ namespace OpenRA { this.modData = modData; cache = modData.MapCache; + this.pPackage = null; Uid = map.Uid; PackageName = map.Package.Name; @@ -605,10 +610,10 @@ namespace OpenRA public void PackageDispose() { - if (_Package != null) + if (pPackage != null) { - _Package.Dispose(); - _Package = null; + pPackage.Dispose(); + pPackage = null; } }