Fix RA+CnC map import of BARB/FENC

OpenRA · Mar 29, 2024 · 8f98511 · 8f98511
1 parent ec09e61
commit 8f98511
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportRedAlertMapCommand.cs
@@ -40,11 +40,11 @@ public override void ValidateMapFormat(int format)
 		// Mapping from RA95 overlay index to type string
 		static readonly string[] RedAlertOverlayNames =
 		{
-			"sbag", "cycl", "brik", "fenc", "wood",
+			"sbag", "cycl", "brik", "barb", "wood",
 			"gold01", "gold02", "gold03", "gold04",
 			"gem01", "gem02", "gem03", "gem04",
 			"v12", "v13", "v14", "v15", "v16", "v17", "v18",
-			"fpls", "wcrate", "scrate", "barb", "sbag",
+			"fpls", "wcrate", "scrate", "fenc", "sbag",
 		};
 
 		static readonly Dictionary<string, (byte Type, byte Index)> OverlayResourceMapping = new()
@@ -80,7 +80,7 @@ void UnpackTileData(MemoryStream ms)
 		static readonly string[] OverlayActors = new string[]
 		{
 			// Fences
-			"sbag", "cycl", "brik", "fenc", "wood",
+			"sbag", "cycl", "brik", "barb", "wood", "fenc",
 
 			// Fields
 			"v12", "v13", "v14", "v15", "v16", "v17", "v18",

diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportTiberianDawnMapCommand.cs
@@ -68,7 +68,7 @@ void UnpackTileData(Stream ms)
 		static readonly string[] OverlayActors = new string[]
 		{
 			// Fences
-			"sbag", "cycl", "brik", "fenc", "wood",
+			"sbag", "cycl", "brik", "barb", "wood",
 
 			// Fields
 			"v12", "v13", "v14", "v15", "v16", "v17", "v18",