Changeset 299 for trunk/UClientGUI.pas

Timestamp:

Jul 10, 2019, 5:48:18 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Error in case of missing building kind.

File:

• trunk/UClientGUI.pas (modified) (3 diffs)

trunk/UClientGUI.pas

@@ -182 +182 @@
       Pen.Width := 1;
     end else
-    if Assigned(Cell.Building) and (Cell.Building.Kind.SpecialType = stCity) then begin
+    if Assigned(Cell.Building) and Assigned(Cell.Building.Kind) and
+    (Cell.Building.Kind.SpecialType = stCity) then begin
       // Cannot set clear border as it will display shifted on gtk2
       //Pen.Style := psClear;
@@ -444 +445 @@
       for Cell in ControlPlayer.PlayerMap.Cells do begin
         if (Cell.MapCell.Terrain <> ttVoid) and View.IsCellVisible(Cell.MapCell) then begin
-          if Assigned(Cell.MapCell.Building) and (Cell.MapCell.Building.Kind.SpecialType = stCity) then begin
+          if Assigned(Cell.MapCell.Building) and Assigned(Cell.MapCell.Building.Kind) and
+          (Cell.MapCell.Building.Kind.SpecialType = stCity) then begin
             // Cannot set clear border as it will display shifted on gtk2
             //Pen.Style := psClear;
@@ -464 +466 @@
         if (MapCell.Terrain <> ttVoid) and View.IsCellVisible(MapCell) then begin
           if View.IsCellVisible(MapCell) and (MapCell.Terrain <> ttVoid) then begin
-            if Assigned(MapCell.Building) and (MapCell.Building.Kind.SpecialType = stCity) then begin
+            if Assigned(MapCell.Building) and Assigned(MapCell.Building.Kind) and
+              (MapCell.Building.Kind.SpecialType = stCity) then begin
               // Cannot set clear border as it will display shifted on gtk2
               //Pen.Style := psClear;