Changeset 294 for trunk/UMap.pas

Timestamp:

Mar 29, 2019, 8:40:42 AM (6 years ago)

Author:

chronos

Message:

• Modified: Change terrain type ttCity to map cell building with special type stCity.

File:

• trunk/UMap.pas (modified) (7 diffs)

trunk/UMap.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl,
+  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl, UBuilding,
   UXMLUtils, UUnit;
 
@@ -18 +18 @@
   TCellLinks = class;
 
-  TTerrainType = (ttVoid, ttNormal, ttCity);
+  TTerrainType = (ttVoid, ttNormal, ttCityUnused);
   TExtraType = (etNone, etObjectiveTarget, etAttack, etDefense, etLookout,
     etGrowLow, etGrowMedium, etGrowHigh);
@@ -27 +27 @@
   private
     FArea: TMapArea;
+    FBuilding: TBuilding;
     FId: Integer;
     FMap: TMap;
@@ -33 +34 @@
     function GetPower: Integer;
     procedure SetArea(AValue: TMapArea);
+    procedure SetBuilding(AValue: TBuilding);
     procedure SetId(AValue: Integer);
     procedure SetPower(AValue: Integer);
@@ -67 +69 @@
     property Area: TMapArea read FArea write SetArea;
     property OneUnit: TUnit read FUnit write SetUnit;
+    property Building: TBuilding read FBuilding write SetBuilding;
     //property Power: Integer read GetPower;
   end;
@@ -619 +622 @@
       if Assigned(OneUnit) then
         Inc(TotalUnits, OneUnit.Power);
-      if Terrain = ttCity then
+      if Assigned(Building) and (Building.Kind.SpecialType = stCity) then
         Inc(TotalCities);
       if Extra = etObjectiveTarget then
@@ -968 +971 @@
 end;
 
+procedure TCell.SetBuilding(AValue: TBuilding);
+var
+  OldValue: TBuilding;
+begin
+  if FBuilding = AValue then Exit;
+  OldValue := FBuilding;
+  FBuilding := nil;
+  if Assigned(OldValue) then OldValue.MapCell := nil;
+  FBuilding := AValue;
+  if Assigned(FBuilding) then FBuilding.MapCell := Self;
+end;
+
 function TCell.GetPower: Integer;
 begin