apply code review remarks

OpenRA · Apr 24, 2024 · 7c5e8a3 · 7c5e8a3
1 parent 7e70b96
commit 7c5e8a3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/OpenRA.Game/Map/MapCache.cs b/OpenRA.Game/Map/MapCache.cs
@@ -172,7 +172,7 @@ void LoadMapInternal(string map, IReadOnlyPackage package, MapClassification cla
 				mapPackage?.Dispose();
 				Console.WriteLine($"Failed to load map: {map}");
 				Console.WriteLine("Details:");
-				Console.WriteLine(System.Environment.StackTrace);
+				Console.WriteLine(e);
 				Log.Write("debug", $"Failed to load map: {map}");
 				Log.Write("debug", "Details:");
 				Log.Write("debug", e);

diff --git a/OpenRA.Game/Map/MapPreview.cs b/OpenRA.Game/Map/MapPreview.cs
@@ -175,16 +175,16 @@ public InnerData Clone()
 
 		public readonly string Uid;
 		public string PackageName { get; private set; }
-		IReadOnlyPackage pPackage;
+		IReadOnlyPackage package;
 		public IReadOnlyPackage Package
 		{
 			get
 			{
-				pPackage ??= parentPackage.OpenPackage(PackageName, modData.ModFiles);
-				return pPackage;
+				package ??= parentPackage.OpenPackage(PackageName, modData.ModFiles);
+				return package;
 			}
 
-			private set => pPackage = value;
+			private set => package = value;
 		}
 
 		IReadOnlyPackage parentPackage;
@@ -270,8 +270,6 @@ public MapPreview(ModData modData, string uid, MapGridType gridType, MapCache ca
 		{
 			this.cache = cache;
 			this.modData = modData;
-			this.pPackage = null;
-			this.PackageName = null;
 
 			Uid = uid;
 			innerData = new InnerData
@@ -298,7 +296,6 @@ public MapPreview(Map map, ModData modData)
 		{
 			this.modData = modData;
 			cache = modData.MapCache;
-			this.pPackage = null;
 
 			Uid = map.Uid;
 			PackageName = map.Package.Name;
@@ -607,10 +604,10 @@ public void Dispose()
 
 		public void PackageDispose()
 		{
-			if (pPackage != null)
+			if (package != null)
 			{
-				pPackage.Dispose();
-				pPackage = null;
+				package.Dispose();
+				package = null;
 			}
 		}
 

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
@@ -247,7 +247,7 @@ public static void SaveMap(ModData modData, World world, Map map, string combine
 			if (map.Package?.Name != combinedPath)
 			{
 				// When creating a new map or when file paths don't match
-				if (modData.MapCache.Any(m => m.Status == MapStatus.Available && m.Package?.Name == combinedPath))
+				if (modData.MapCache.Any(m => m.Status == MapStatus.Available && m.PackageName == combinedPath))
 				{
 					ConfirmationDialogs.ButtonPrompt(modData,
 						title: OverwriteMapFailedTitle,

diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
@@ -141,7 +141,7 @@ public MissionBrowserLogic(Widget widget, ModData modData, World world, Action o
 						.Select(p => new
 						{
 							Preview = p,
-							Index = missionMapPaths.IndexOf(Path.GetFileName(p.Package.Name))
+							Index = missionMapPaths.IndexOf(Path.GetFileName(p.PackageName))
 						})
 						.Where(x => x.Index != -1)
 						.OrderBy(x => x.Index)