Changeset 299

Timestamp:

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

Author:

chronos

Message:

• Fixed: Error in case of missing building kind.

Location:

trunk

Files:

• Forms/UFormItem.lfm (modified) (2 diffs)
• UBuilding.pas (modified) (2 diffs)
• UClientGUI.pas (modified) (3 diffs)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (2 diffs)
• UMap.pas (modified) (1 diff)

trunk/Forms/UFormItem.lfm

@@ -12 +12 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.2.0'
   object ButtonOk: TButton
     Left = 74
@@ -30 +30 @@
     Top = 260
     Width = 94
-    Anchors = [akLeft]
+    Anchors = [akLeft, akBottom]
     Caption = 'Cancel'
     ModalResult = 2

trunk/UBuilding.pas

@@ -42 +42 @@
   public
     Kind: TBuildingKind;
+    procedure Assign(Source: TItem); override;
     property MapCell: TObject read FMapCell write SetMapCell; // TMapCell;
   end;
@@ -88 +89 @@
   FMapCell := AValue;
   if Assigned(FMapCell) then TCell(FMapCell).Building := Self;
+end;
+
+procedure TBuilding.Assign(Source: TItem);
+begin
+  inherited;
+  Kind := TBuilding(Source).Kind;
 end;
 

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;

trunk/UCore.pas

@@ -483 +483 @@
   LocalClients := TClients.Create;
   GameSettings := TGame.Create;
+  GameSettings.FileName := 'Settings';
   Game := TGame.Create;
   Game.OnMoveUpdated := DoMoveUpdated;

trunk/UGame.pas

@@ -61 +61 @@
     procedure WinObjectiveMapPrepare;
   public
+    FileName: string;
     DevelMode: Boolean;
     Players: TPlayers;
@@ -81 +82 @@
     StayAliveForDefinedTurns: Integer;
     MaxNeutralUnits: Integer;
-    FileName: string;
     FogOfWar: Boolean;
     BridgeEnabled: Boolean;

trunk/UMap.pas

@@ -622 +622 @@
       if Assigned(OneUnit) then
         Inc(TotalUnits, OneUnit.Power);
-      if Assigned(Building) and (Building.Kind.SpecialType = stCity) then
+      if Assigned(Building) and Assigned(Building.Kind) and
+      (Building.Kind.SpecialType = stCity) then
         Inc(TotalCities);
       if Extra = etObjectiveTarget then