Add support for FA2 NEWURBAN hack

CnCNet · Oct 17, 2024 · 1f02445 · 1f02445
1 parent 4f1c9f2
commit 1f02445
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/TSMapEditor/CCEngine/Theater.cs b/src/TSMapEditor/CCEngine/Theater.cs
@@ -56,21 +56,6 @@ public Theater(string name)
             UIName = name;
         }
 
-        public Theater(string uiName, string configIniName, List<string> contentMixName,
-            List<string> optionalContentMixName, string paletteName, string unitPaletteName,
-            string tiberiumPaletteName, string fileExtension, char newTheaterBuildingLetter)
-        {
-            UIName = uiName;
-            ConfigINIPath = configIniName;
-            ContentMIXName = contentMixName;
-            OptionalContentMIXName = optionalContentMixName;
-            TerrainPaletteName = paletteName;
-            UnitPaletteName = unitPaletteName;
-            TiberiumPaletteName = tiberiumPaletteName;
-            FileExtension = fileExtension;
-            NewTheaterBuildingLetter = newTheaterBuildingLetter;
-        }
-
         public string UIName { get; }
         public string ConfigINIPath { get; set; }
         public List<string> ContentMIXName { get; set; }
@@ -79,6 +64,7 @@ public Theater(string uiName, string configIniName, List<string> contentMixName,
         public string UnitPaletteName { get; set; }
         public string TiberiumPaletteName { get; set; }
         public string FileExtension { get; set; }
+        public string FallbackTileFileExtension { get; set; }
         public char NewTheaterBuildingLetter { get; set; }
 
         public List<string> RoughConnectToTileSets { get; set; }

diff --git a/src/TSMapEditor/Rendering/TheaterGraphics.cs b/src/TSMapEditor/Rendering/TheaterGraphics.cs
@@ -517,7 +517,16 @@ private void ReadTileTextures()
                         }
 
                         string fileName = baseName + Theater.FileExtension;
-                        byte[] data = fileManager.LoadFile(baseName + Theater.FileExtension);
+                        byte[] data = fileManager.LoadFile(fileName);
+
+                        if (data == null && !string.IsNullOrWhiteSpace(Theater.FallbackTileFileExtension))
+                        {
+                            // Support for FA2 NEWURBAN hack. FA2 Marble.mix does not contain Marble Madness graphics for NEWURBAN, only URBAN.
+                            // To allow Marble Madness to work in NEWURBAN, FA2 also loads .urb files for NEWURBAN.
+                            // We must do the same at least for now.
+                            fileName = baseName + Theater.FallbackTileFileExtension;
+                            data = fileManager.LoadFile(fileName);
+                        }
 
                         if (data == null)
                         {