Fix errors when reading Rules file, some other bugfixes

axx0 · axx0 · commit 213338eccd61 · 2025-01-21T17:33:09.000+01:00
diff --git a/Civ2/ImageLoader/TerrainLoader.cs b/Civ2/ImageLoader/TerrainLoader.cs
@@ -17,6 +17,7 @@ public static class TerrainLoader
     {
         public static void LoadTerrain(Ruleset ruleset, IUserInterface active)
         {
+            active.TileSets.Clear();
             for (var i = 0; i < active.ExpectedMaps; i++)
             {
                 active.TileSets.Add(LoadTerrain(ruleset, i, active));
@@ -30,11 +31,11 @@ private static TerrainSet LoadTerrain(Ruleset ruleset, int index, IUserInterface
 
             // Get dither tile before making it transparent
             var ditherTile = Images.ExtractBitmap(MapIndexChange((BitmapStorage)active.PicSources["dither"][0], index, active));
-            
+
             Color gray;
             unsafe
             {
-                // Get the gray colour (it's not always the same in MGE/TOT, unlike pink)
+                // Get the gray colour (it's not always the same in MGE/TOT, unlike magenta)
                 var imageColours = ditherTile.LoadColors();
                 gray = imageColours[0];
                 Image.UnloadColors(imageColours);
diff --git a/Civ2/Rules/Initialization.cs b/Civ2/Rules/Initialization.cs
@@ -5,6 +5,7 @@
 using Civ2engine.IO;
 using Model;
 using Model.Core;
+using RaylibUtils;
 
 namespace Civ2.Rules;
 
@@ -34,8 +35,8 @@ public static void LoadGraphicsAssets(Civ2Interface civ2Interface)
     {
         var ruleSet = civ2Interface.MainApp.ActiveRuleSet;
         ConfigObject.Rules = RulesParser.ParseRules(ruleSet);
-        
-        //TODO: Check is interface already hase initialized images and unload them
+
+        Images.ClearCache();
         TerrainLoader.LoadTerrain(ruleSet, civ2Interface);
         UnitLoader.LoadUnits(ruleSet, civ2Interface);
         CityLoader.LoadCities(ruleSet, civ2Interface.CityImages, civ2Interface);
diff --git a/Civ2TOT/TestOfTimeInterface.cs b/Civ2TOT/TestOfTimeInterface.cs
@@ -223,7 +223,10 @@ public override void Initialize()
             { "globalWarming", Enumerable.Range(0, 4).Select(col =>
                     new BitmapStorage("ICONS", new Rectangle(49 + 15 * col, 305, 14, 14), true)).ToArray() },
             { "backgroundImage", new[]{ new BinaryStorage("Tiles.dll", 0x100740, 0x12702) } },
+            { "backgroundImageSmall1", new[]{ new BinaryStorage("Tiles.dll", 0xF5C44, 0xAAFC, new Rectangle(332, 134, 64, 64)) } },
             { "backgroundImageSmall2", new[]{ new BinaryStorage("Tiles.dll", 0xF5C44, 0xAAFC, new Rectangle(398, 134, 64, 64)) } },
+            { "cityBuiltAncient", new[]{ new BinaryStorage("Tiles.dll", 0xE3D1C, 0x5A34) } },
+            { "cityBuiltModern", new[]{ new BinaryStorage("Tiles.dll", 0xE9750, 0x5C2D) } },
             { "observatoryPic", new[]{ new BinaryStorage("Intro.dll", 0x1E630, 0xACDC) } },
             { "horzionPic", new[]{ new BinaryStorage("Intro.dll", 0x1E630, 0xACDC) } },
             { "creaturePic", new[]{ new BinaryStorage("Intro.dll", 0x2EBB4, 0x14600) } },
diff --git a/Engine/src/IO/RulesParser.cs b/Engine/src/IO/RulesParser.cs
@@ -207,13 +207,12 @@ private void ProcessLeaders(string[] values)
             Rules.Leaders = values.Select((value,id) =>
             {
                 var line = value.Split(',', StringSplitOptions.TrimEntries);
-                var titles = new List<LeaderTitle>(
-                );
+                var titles = new List<LeaderTitle>();
                 for(var i = 12; i < line.Length;i+=3)
                 {
                     titles.Add(new LeaderTitle
                     {
-                        Gov = int.Parse(line[i-2]),
+                        Gov = int.TryParse(line[i-2], out int val0) ? val0 : 0,
                         TitleMale = line[i-1],
                         TitleFemale = line[i],
                     });
@@ -224,13 +223,13 @@ private void ProcessLeaders(string[] values)
                     NameMale = line[0],
                     NameFemale = line[1],
                     Female = int.Parse(line[2]) == 1,
-                    Color = int.Parse(line[3]),
-                    CityStyle = int.Parse(line[4]),
+                    Color = int.TryParse(line[3], out int val) ? val : 0,
+                    CityStyle = int.TryParse(line[4], out val) ? val : 0,
                     Plural = line[5],
                     Adjective = line[6],
-                    Attack = int.Parse(line[7]),
-                    Expand = int.Parse(line[8]),
-                    Civilize = int.Parse(line[9]),
+                    Attack = int.TryParse(line[7], out val) ? val : 0,
+                    Expand = int.TryParse(line[8], out val) ? val : 0,
+                    Civilize = int.TryParse(line[9], out val) ? val : 0,
                     Titles = titles.ToArray()
                 };
             }).ToArray();
@@ -293,7 +292,7 @@ private void ProcessTerrain(IEnumerable<string>? values)
                 if (row < 11)
                 {
                     if (!mappings.ContainsKey(parts[1]))
-                        mappings.Add(parts[1].Substring(0, 3), terrains.Count);
+                        mappings.Add(parts[1].Length > 3 ? parts[1][..3] : parts[1], terrains.Count);
                     terrains.Add(parts[0]);
                 }
                 else
@@ -326,19 +325,19 @@ private void ProcessTerrain(IEnumerable<string>? values)
                 {
                     Type = (TerrainType) type,
                     Name = line[0],
-                    MoveCost = int.Parse(line[1]),
-                    Defense = int.Parse(line[2]),
-                    Food = int.Parse(line[3]),
-                    Shields = int.Parse(line[4]),
-                    Trade = int.Parse(line[5]),
+                    MoveCost = int.TryParse(line[1], out int val) ? val : 1,
+                    Defense = int.TryParse(line[2], out val) ? val : 1,
+                    Food = int.TryParse(line[3], out val) ? val : 0,
+                    Shields = int.TryParse(line[4], out val) ? val : 0,
+                    Trade = int.TryParse(line[5], out val) ? val : 0,
                     CanIrrigate = mappings[line[6]],
-                    IrrigationBonus = int.Parse(line[7]),
-                    TurnsToIrrigate = int.Parse(line[8]),
-                    MinGovrnLevelAItoPerformIrrigation = int.Parse(line[9]),
+                    IrrigationBonus = int.TryParse(line[7], out val) ? val : 0,
+                    TurnsToIrrigate = int.TryParse(line[8], out val) ? val : 0,
+                    MinGovrnLevelAItoPerformIrrigation = int.TryParse(line[9], out val) ? val : 0,
                     CanMine = mappings[line[10]],
-                    MiningBonus = int.Parse(line[11]),
-                    TurnsToMine = int.Parse(line[12]),
-                    MinGovrnLevelAItoPerformMining = int.Parse(line[13]),
+                    MiningBonus = int.TryParse(line[11], out val) ? val : 0,
+                    TurnsToMine = int.TryParse(line[12], out val) ? val : 0,
+                    MinGovrnLevelAItoPerformMining = int.TryParse(line[13], out val) ? val : 0,
                     Transform = mappings[line[14]],
                     Impassable = line[15] == "yes",
                     RoadBonus = type <= (int)TerrainType.Grassland ? 1:0, 
@@ -370,17 +369,17 @@ private void ProcessUnits(string[] values)
                 {
                     Type = type,
                     Name = text[0],
-                    Until = Rules.AdvanceMappings.ContainsKey(text[1]) ? Rules.AdvanceMappings[text[1]] : -1,   // temp
-                    Domain = (UnitGas) int.Parse(text[2]),
-                    Move = Rules.Cosmic.MovementMultiplier * int.Parse(text[3].Replace(".", string.Empty)),
-                    Range = int.Parse(text[4]),
-                    Attack = int.Parse(text[5].Replace("a", string.Empty)),
-                    Defense = int.Parse(text[6].Replace("d", string.Empty)),
-                    Hitp = 10 * int.Parse(text[7].Replace("h", string.Empty)),
-                    Firepwr = int.Parse(text[8].Replace("f", string.Empty)),
-                    Cost = int.Parse(text[9]),
-                    Hold = int.Parse(text[10]),
-                    AIrole = (AIroleType)int.Parse(text[11]),
+                    Until = Rules.AdvanceMappings.TryGetValue(text[1], out int value) ? value : -1,
+                    Domain = (UnitGas) (int.TryParse(text[2], out value) ? value : 0),
+                    Move = Rules.Cosmic.MovementMultiplier * (int.TryParse(text[3].Replace(".", string.Empty), out value) ? value : 0),
+                    Range = int.TryParse(text[4], out value) ? value : 0,
+                    Attack = int.TryParse(text[5].Replace("a", string.Empty), out value) ? value : 0,
+                    Defense = int.TryParse(text[6].Replace("d", string.Empty), out value) ? value : 0,
+                    Hitp = 10 * (int.TryParse(text[7].Replace("h", string.Empty), out value) ? value : 0),
+                    Firepwr = int.TryParse(text[8].Replace("f", string.Empty), out value) ? value : 0,
+                    Cost = int.TryParse(text[9], out value) ? value : 0,
+                    Hold = int.TryParse(text[10], out value) ? value : 0,
+                    AIrole = (AIroleType)(int.TryParse(text[11], out value) ? value : 0),
                     Prereq = Rules.AdvanceMappings.ContainsKey(text[12]) ? Rules.AdvanceMappings[text[12]] : -1,    // temp
                     Flags = text[13],
                     AttackSound = defaultAttackSounds.FirstOrDefault(s=>s.Item1 == type)?.Item2
@@ -405,15 +404,14 @@ private void ProcessUnits(string[] values)
         
         private void ProcessAdvancedUnitFlags(string[] values)
         {
-            
             var limit = values.Length < Rules.UnitTypes.Length ? values.Length : Rules.UnitTypes.Length;
             for (int i = 0; i < limit; i++)
             {
                 var line = values[i].Split(new []{ ',',';'}, StringSplitOptions.TrimEntries);
                 var unit = Rules.UnitTypes[i];
                 unit.CivCanBuild = ReadBitsReversed(line[0]);
                 unit.CanBeOnMap = ReadBitsReversed(line[1]);
-                unit.MinBribe = int.Parse(line[2]);
+                unit.MinBribe = int.TryParse(line[2], out int val) ? val : 0;
                 var extraFlags = ReadBitsReversed(line[6]);
                 unit.Invisible = extraFlags[0];
                 unit.NonDispandable = extraFlags[1];
@@ -456,9 +454,9 @@ private void ProcessImprovements(string[] values)
                 {
                     Type = type,
                     Name = parts[0],
-                    Cost = int.Parse(parts[1]),
-                    Upkeep = int.Parse(parts[2]),
-                    Prerequisite = Rules.AdvanceMappings.ContainsKey(parts[3]) ? Rules.AdvanceMappings[parts[3]] : -1   // temp
+                    Cost = int.TryParse(parts[1], out int val) ? val : 1,
+                    Upkeep = int.TryParse(parts[2], out val) ? val : 0,
+                    Prerequisite = Rules.AdvanceMappings.TryGetValue(parts[3], out val) ? val : -1
                 };
             }).ToArray();
         }
@@ -542,12 +540,12 @@ private void ProcessTech(IReadOnlyList<string> values)
                 {
                     Index = index,
                     Name = text[0],
-                    AIvalue = int.Parse(text[1]),
-                    Modifier = int.Parse(text[2]),
-                    Prereq1 = Rules.AdvanceMappings.ContainsKey(text[3]) ? Rules.AdvanceMappings[text[3]] : -1, // temp
-                    Prereq2 = Rules.AdvanceMappings.ContainsKey(text[4]) ? Rules.AdvanceMappings[text[4]] : -1, // temp
-                    Epoch =  int.Parse(text[5]),
-                    KnowledgeCategory = int.Parse(text[6])
+                    AIvalue = int.TryParse(text[1], out int val) ? val : 1,
+                    Modifier = int.TryParse(text[2], out val) ? val : 0,
+                    Prereq1 = Rules.AdvanceMappings.TryGetValue(text[3], out val) ? val : -1,
+                    Prereq2 = Rules.AdvanceMappings.TryGetValue(text[4], out val) ? val : -1,
+                    Epoch = int.TryParse(text[5], out val) ? val : 0,
+                    KnowledgeCategory = int.TryParse(text[6], out val) ? val : 0
                 };
             }).ToArray();
         }
@@ -571,11 +569,11 @@ private Special MakeSpecial(string source)
             return new Special
             {
                 Name = line[0],
-                MoveCost = int.Parse(line[1]),
-                Defense = int.Parse(line[2]),
-                Food = int.Parse(line[3]),
-                Shields = int.Parse(line[4]),
-                Trade = int.Parse(line[5]),
+                MoveCost = int.TryParse(line[1], out int val) ? val : 1,
+                Defense = int.TryParse(line[2], out val) ? val : 1,
+                Food = int.TryParse(line[3], out val) ? val : 0,
+                Shields = int.TryParse(line[4], out val) ? val : 0,
+                Trade = int.TryParse(line[5], out val) ? val : 0,
             };
         }
     }
diff --git a/Engine/src/MapObjects/Islands.cs b/Engine/src/MapObjects/Islands.cs
@@ -109,6 +109,8 @@ public static void RenumberOceans(this Map map, List<Tile> oceanTiles)
         
         public static void RenumberOceans(this Map map, IEnumerable<IslandDetails> oceans)
         {
+            if (!oceans.Any()) return;
+
             var orderedOceans = oceans.OrderByDescending(i => i.Tiles.Count).ToList();
 
             orderedOceans[0].Id = 0;
diff --git a/RaylibUI/BasicTypes/Controls/ImageBox.cs b/RaylibUI/BasicTypes/Controls/ImageBox.cs
@@ -3,11 +3,13 @@
 using Model.Images;
 using RaylibUtils;
 using Model.Dialog;
+using Model;
 
 namespace RaylibUI.BasicTypes.Controls;
 
 public class ImageBox : BaseControl
 {
+    private readonly IUserInterface _active;
     private readonly IImageSource[] _image;
     private readonly float _scale;
     private readonly int[,] _coords;
@@ -17,16 +19,17 @@ public ImageBox(IControlLayout controller, DialogImageElements image) : base(con
         _image = image.Image;
         _scale = image.Scale;
         _coords = image.Coords;
+        _active = controller.MainWindow.ActiveInterface;
     }
 
     public override int GetPreferredWidth()
     {
-        return _image.Select(img => Images.GetImageWidth(img, _scale)).Max();
+        return _image.Select(img => Images.GetImageWidth(img, _active, _scale)).Max();
     }
 
     public override int GetPreferredHeight()
     {
-        return _image.Select(img => Images.GetImageHeight(img, _scale)).Max();
+        return _image.Select(img => Images.GetImageHeight(img, _active, _scale)).Max();
     }
 
     public override void Draw(bool pulse)
diff --git a/RaylibUI/BasicTypes/Controls/OptionControl.cs b/RaylibUI/BasicTypes/Controls/OptionControl.cs
@@ -17,7 +17,7 @@ internal class OptionControl : LabelControl
     public override bool CanFocus => true;
 
     public OptionControl(IControlLayout controller, string text, int index, bool isChecked, IImageSource[] images) : base(
-        controller, text, eventTransparent: false, offset: Images.GetImageWidth(images[0]),
+        controller, text, eventTransparent: false, offset: Images.GetImageWidth(images[0], controller.MainWindow.ActiveInterface),
         font: controller.MainWindow.ActiveInterface.Look.LabelFont,
         fontSize: controller.MainWindow.ActiveInterface.Look.LabelFontSize,
         colorFront: controller.MainWindow.ActiveInterface.Look.LabelColour,
@@ -26,8 +26,8 @@ public OptionControl(IControlLayout controller, string text, int index, bool isC
         Index = index;
         Checked = isChecked;
         _images = images;
-        _imageWidth = Images.GetImageWidth(images[0]);
-        _imageHeight = Images.GetImageHeight(images[0]);
+        _imageWidth = Images.GetImageWidth(images[0], controller.MainWindow.ActiveInterface);
+        _imageHeight = Images.GetImageHeight(images[0], controller.MainWindow.ActiveInterface);
     }
 
     public int Index { get; }
diff --git a/RaylibUI/RunGame/Commands/Orders/BuildCity.cs b/RaylibUI/RunGame/Commands/Orders/BuildCity.cs
@@ -72,11 +72,11 @@ public override bool Update()
 
             if (activeTile.CityHere != null)
             {
-                return SetCommandState(activeTile.CityHere.Size < GameScreen.Game.Rules.Cosmic.ToExceedCitySizeAqueductNeeded ? CommandStatus.Normal : CommandStatus.Disabled, Labels.For(LabelIndex.JoinCity), errorPopupKeyword: "ONLY10", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image) - 5 } }));
+                return SetCommandState(activeTile.CityHere.Size < GameScreen.Game.Rules.Cosmic.ToExceedCitySizeAqueductNeeded ? CommandStatus.Normal : CommandStatus.Disabled, Labels.For(LabelIndex.JoinCity), errorPopupKeyword: "ONLY10", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image, _active) - 5 } }));
             }
             else
             {
-                return SetCommandState(errorPopupKeyword: "ADJACENTCITY", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image) - 5 } }));
+                return SetCommandState(errorPopupKeyword: "ADJACENTCITY", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image, _active) - 5 } }));
             }
         }
 
diff --git a/RaylibUtils/Images.ImportBitmaps.cs b/RaylibUtils/Images.ImportBitmaps.cs
@@ -87,14 +87,14 @@ public static Image ExtractBitmap(IImageSource imageSource)
             return ExtractBitmapData(imageSource, active: null).Image;
         }
 
-        public static int GetImageWidth(IImageSource? imageSource, float scale = 1f) 
+        public static int GetImageWidth(IImageSource? imageSource, IUserInterface active, float scale = 1f) 
         { 
-            return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource).Width * scale);
+            return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource, active).Width * scale);
         }
 
-        public static int GetImageHeight(IImageSource? imageSource, float scale = 1f)
+        public static int GetImageHeight(IImageSource? imageSource, IUserInterface active, float scale = 1f)
         {
-            return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource).Height * scale);
+            return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource, active).Height * scale);
         }
 
         public static ImageProps ExtractBitmapData(IImageSource imageSource, IUserInterface? active, int owner = -1, string[]? searchPaths = null)
@@ -140,6 +140,7 @@ public static ImageProps ExtractBitmapData(IImageSource imageSource, IUserInterf
                             string[] _paths = active != null ?
                                 active.MainApp.ActiveRuleSet.Paths : searchPaths ?? Settings.SearchPaths;
                             var path = Utils.GetFilePath(bitmapStorage.Filename, _paths, bitmapStorage.Extension);
+                            path ??= Utils.GetFilePath(bitmapStorage.Filename, Settings.SearchPaths, bitmapStorage.Extension);
                             var source_img_bpp = Images.LoadImageFromFile(path);
                             _imageCache[sourceKey] = source_img_bpp.Image;
                             _sourceBpp[sourceKey] = source_img_bpp.ColourDepth;
diff --git a/RaylibUtils/Images.cs b/RaylibUtils/Images.cs
@@ -67,6 +67,8 @@ public static Image_and_bpp LoadImageFromFile(string filename, int dataStart = 0
             var height = BitConverter.ToInt32(bytes, 22);
             bpp = BitConverter.ToInt16(bytes, 28);
             var size = BitConverter.ToInt32(bytes, 34);
+            if (size == 0)
+                size = bytes.Length - dataOffset;
             var extraBits = size / height - bpp / 8 * width;
             var imgData = new byte[4 * width * height];
             int flag1Color = Convert.ToInt32("0x0000FFFF", 16);

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public static class TerrainLoader`
`17`	`17`	`{`
`18`	`18`	`public static void LoadTerrain(Ruleset ruleset, IUserInterface active)`
`19`	`19`	`{`
	`20`	`+ active.TileSets.Clear();`
`20`	`21`	`for (var i = 0; i < active.ExpectedMaps; i++)`
`21`	`22`	`{`
`22`	`23`	`active.TileSets.Add(LoadTerrain(ruleset, i, active));`
`@@ -30,11 +31,11 @@ private static TerrainSet LoadTerrain(Ruleset ruleset, int index, IUserInterface`
`30`	`31`
`31`	`32`	`// Get dither tile before making it transparent`
`32`	`33`	`var ditherTile = Images.ExtractBitmap(MapIndexChange((BitmapStorage)active.PicSources["dither"][0], index, active));`
`33`		`-`
	`34`	`+`
`34`	`35`	`Color gray;`
`35`	`36`	`unsafe`
`36`	`37`	`{`
`37`		`- // Get the gray colour (it's not always the same in MGE/TOT, unlike pink)`
	`38`	`+ // Get the gray colour (it's not always the same in MGE/TOT, unlike magenta)`
`38`	`39`	`var imageColours = ditherTile.LoadColors();`
`39`	`40`	`gray = imageColours[0];`
`40`	`41`	`Image.UnloadColors(imageColours);`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ public static void RenumberOceans(this Map map, List<Tile> oceanTiles)`
`109`	`109`
`110`	`110`	`public static void RenumberOceans(this Map map, IEnumerable<IslandDetails> oceans)`
`111`	`111`	`{`
	`112`	`+ if (!oceans.Any()) return;`
	`113`	`+`
`112`	`114`	`var orderedOceans = oceans.OrderByDescending(i => i.Tiles.Count).ToList();`
`113`	`115`
`114`	`116`	`orderedOceans[0].Id = 0;`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,13 @@`
`3`	`3`	`using Model.Images;`
`4`	`4`	`using RaylibUtils;`
`5`	`5`	`using Model.Dialog;`
	`6`	`+using Model;`
`6`	`7`
`7`	`8`	`namespace RaylibUI.BasicTypes.Controls;`
`8`	`9`
`9`	`10`	`public class ImageBox : BaseControl`
`10`	`11`	`{`
	`12`	`+ private readonly IUserInterface _active;`
`11`	`13`	`private readonly IImageSource[] _image;`
`12`	`14`	`private readonly float _scale;`
`13`	`15`	`private readonly int[,] _coords;`
`@@ -17,16 +19,17 @@ public ImageBox(IControlLayout controller, DialogImageElements image) : base(con`
`17`	`19`	`_image = image.Image;`
`18`	`20`	`_scale = image.Scale;`
`19`	`21`	`_coords = image.Coords;`
	`22`	`+ _active = controller.MainWindow.ActiveInterface;`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`public override int GetPreferredWidth()`
`23`	`26`	`{`
`24`		`- return _image.Select(img => Images.GetImageWidth(img, _scale)).Max();`
	`27`	`+ return _image.Select(img => Images.GetImageWidth(img, _active, _scale)).Max();`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`public override int GetPreferredHeight()`
`28`	`31`	`{`
`29`		`- return _image.Select(img => Images.GetImageHeight(img, _scale)).Max();`
	`32`	`+ return _image.Select(img => Images.GetImageHeight(img, _active, _scale)).Max();`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`public override void Draw(bool pulse)`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ public override bool Update()`
`72`	`72`
`73`	`73`	`if (activeTile.CityHere != null)`
`74`	`74`	`{`
`75`		`- return SetCommandState(activeTile.CityHere.Size < GameScreen.Game.Rules.Cosmic.ToExceedCitySizeAqueductNeeded ? CommandStatus.Normal : CommandStatus.Disabled, Labels.For(LabelIndex.JoinCity), errorPopupKeyword: "ONLY10", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image) - 5 } }));`
	`75`	`+ return SetCommandState(activeTile.CityHere.Size < GameScreen.Game.Rules.Cosmic.ToExceedCitySizeAqueductNeeded ? CommandStatus.Normal : CommandStatus.Disabled, Labels.For(LabelIndex.JoinCity), errorPopupKeyword: "ONLY10", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image, _active) - 5 } }));`
`76`	`76`	`}`
`77`	`77`	`else`
`78`	`78`	`{`
`79`		`- return SetCommandState(errorPopupKeyword: "ADJACENTCITY", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image) - 5 } }));`
	`79`	`+ return SetCommandState(errorPopupKeyword: "ADJACENTCITY", errorPopupImage: new(new[] { cityImage.Image, flagImage.Image }, 2, coords: new int[,] { { 0, 0 }, { (int)cityImage.FlagLoc.X, (int)cityImage.FlagLoc.Y - Images.GetImageHeight(flagImage.Image, _active) - 5 } }));`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -87,14 +87,14 @@ public static Image ExtractBitmap(IImageSource imageSource)`
`87`	`87`	`return ExtractBitmapData(imageSource, active: null).Image;`
`88`	`88`	`}`
`89`	`89`
`90`		`- public static int GetImageWidth(IImageSource? imageSource, float scale = 1f)`
	`90`	`+ public static int GetImageWidth(IImageSource? imageSource, IUserInterface active, float scale = 1f)`
`91`	`91`	`{`
`92`		`- return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource).Width * scale);`
	`92`	`+ return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource, active).Width * scale);`
`93`	`93`	`}`
`94`	`94`
`95`		`- public static int GetImageHeight(IImageSource? imageSource, float scale = 1f)`
	`95`	`+ public static int GetImageHeight(IImageSource? imageSource, IUserInterface active, float scale = 1f)`
`96`	`96`	`{`
`97`		`- return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource).Height * scale);`
	`97`	`+ return imageSource == null ? 0 : (int)(ExtractBitmap(imageSource, active).Height * scale);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public static ImageProps ExtractBitmapData(IImageSource imageSource, IUserInterface? active, int owner = -1, string[]? searchPaths = null)`
`@@ -140,6 +140,7 @@ public static ImageProps ExtractBitmapData(IImageSource imageSource, IUserInterf`
`140`	`140`	`string[] _paths = active != null ?`
`141`	`141`	`active.MainApp.ActiveRuleSet.Paths : searchPaths ?? Settings.SearchPaths;`
`142`	`142`	`var path = Utils.GetFilePath(bitmapStorage.Filename, _paths, bitmapStorage.Extension);`
	`143`	`+ path ??= Utils.GetFilePath(bitmapStorage.Filename, Settings.SearchPaths, bitmapStorage.Extension);`
`143`	`144`	`var source_img_bpp = Images.LoadImageFromFile(path);`
`144`	`145`	`_imageCache[sourceKey] = source_img_bpp.Image;`
`145`	`146`	`_sourceBpp[sourceKey] = source_img_bpp.ColourDepth;`