Always display tile variant 0 for tiles in BridgeSet and TrainBridgeSet

Author: Rampastring

src/TSMapEditor/CCEngine/Theater.cs

@@ -77,6 +77,8 @@ public Theater(string name)
         public List<TileSet> TileSets = new List<TileSet>();
         public List<LATGround> LATGrounds = new List<LATGround>();
         public TileSet RampTileSet { get; set; }
+        public TileSet BridgeTileSet { get; set; }
+        public TileSet TrainBridgeTileSet { get; set; }
 
         private const string REQUIRED_SECTION = "General";
 
@@ -131,11 +133,19 @@ public void ReadConfigINI(string baseDirectoryPath, CCFileManager ccFileManager)
 
             int rampTileSetIndex = theaterIni.GetIntValue("General", "RampBase", -1);
             if (rampTileSetIndex < 0 || rampTileSetIndex >= TileSets.Count)
-            {
                 throw new INIConfigException("Invalid value specified for RampBase= in the theater configuration file!");
-            }
+
+            int bridgeTileSetIndex = theaterIni.GetIntValue("General", "BridgeSet", -1);
+            if (bridgeTileSetIndex < 0 || bridgeTileSetIndex >= TileSets.Count)
+                throw new INIConfigException("Invalid value specified for BridgeSet= in the theater configuration file!");
+
+            int trainBridgeTileSetIndex = theaterIni.GetIntValue("General", "TrainBridgeSet", -1);
+            if (trainBridgeTileSetIndex < 0 || trainBridgeTileSetIndex >= TileSets.Count)
+                throw new INIConfigException("Invalid value specified for TrainBridgeSet= in the theater configuration file!");
 
             RampTileSet = TileSets[rampTileSetIndex];
+            BridgeTileSet = TileSets[bridgeTileSetIndex];
+            TrainBridgeTileSet = TileSets[trainBridgeTileSetIndex];
         }
 
         public TileSet TryGetTileSetById(int id)

src/TSMapEditor/Constants.cs

@@ -1,11 +1,10 @@
 using Rampastring.Tools;
-using System;
 
 namespace TSMapEditor
 {
     public static class Constants
     {
-        public const string ReleaseVersion = "1.4.11";
+        public const string ReleaseVersion = "1.4.12";
 
         public static int CellSizeX = 48;
         public static int CellSizeY = 24;

src/TSMapEditor/Rendering/MapView.cs

@@ -654,7 +654,15 @@ public void DrawTerrainTile(MapTile tile)
             Point2D drawPoint = CellMath.CellTopLeftPointFromCellCoords(new Point2D(tile.X, tile.Y), Map);
 
             if (tile.TileImage == null)
-                tile.TileImage = TheaterGraphics.GetTileGraphics(tile.TileIndex);
+            {
+                // Hardcode variant 0 for bridges and train bridges so they don't appear damaged
+                // Ideally we'd need to check HasDamagedData in the subcell's TmpImage, but that
+                // would be very messy... gg, Westwood.
+                if (TheaterGraphics.Theater.BridgeTileSet.ContainsTile(tile.TileIndex) || TheaterGraphics.Theater.TrainBridgeTileSet.ContainsTile(tile.TileIndex))
+                    tile.TileImage = TheaterGraphics.GetTileGraphics(tile.TileIndex, 0);
+                else
+                    tile.TileImage = TheaterGraphics.GetTileGraphics(tile.TileIndex);
+            }
 
             TileImage tileImage;
             int subTileIndex;

src/TSMapEditor/Rendering/TheaterGraphics.cs

@@ -424,7 +424,7 @@ public class TheaterGraphics : ITheater
         public int TileCount => terrainGraphicsList.Count;
 
         public TileImage GetTileGraphics(int id) => terrainGraphicsList[id][random.Next(terrainGraphicsList[id].Length)];
-        public TileImage GetTileGraphics(int id, int randomId) => terrainGraphicsList[id][randomId];
+        public TileImage GetTileGraphics(int id, int variantId) => terrainGraphicsList[id][variantId];
         public TileImage GetMarbleMadnessTileGraphics(int id) => mmTerrainGraphicsList[id][0];
         public bool HasSeparateMarbleMadnessTileGraphics(int id) => hasMMGraphics[id];