Changeset 409 for tags/1.4.0/Game.pas

Timestamp:

Jan 8, 2025, 11:01:27 AM (34 hours ago)

Author:

chronos

Message:

Merged revision(s) 403-408 from trunk:

• Added: Cover image.
• Fixed: Crash on cyclic map new move creation.
• Modified: TView class moved into separate unit.
• Added: French translation.
• Fixed: Do not stop running game on Quit action.
• Fixed: Cell cities were not correctly stored the saved game.
• Fixed: ItemList references were loaded by item index instead of item id.
• Fixed: Wrong default map image path initialization.

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Game.pas (modified) (9 diffs)

tags/1.4.0/Game.pas

@@ -58 +58 @@
     procedure InitDefaultPlayers;
     procedure WinObjectiveMapPrepare;
+    procedure BuildCity(Cell: TCell);
   public
     GameSystem: TGameSystem;
@@ -342 +343 @@
   with Cell do begin
     if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then begin
-      Building := Buildings.AddItem('City');
-      Building.Kind := GameSystem.BuildingKinds.FindBySpecialType(stCity);
+      BuildCity(Cell);
     end;
   end;
@@ -369 +369 @@
           StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
 
-        if CityEnabled then begin
-          StartCell.Building := Buildings.AddItem('City');
-          StartCell.Building.Kind := GameSystem.BuildingKinds.FindBySpecialType(stCity);
-        end;
+        if CityEnabled then BuildCity(StartCell);
         StartCell.Player := Player;
         if GameSystem.UnitKinds.Count > 0 then begin
@@ -497 +494 @@
 end;
 
+procedure TGame.BuildCity(Cell: TCell);
+var
+  CityBuildingKind: TBuildingKind;
+begin
+  CityBuildingKind := GameSystem.BuildingKinds.FindBySpecialType(stCity);
+  if not Assigned(CityBuildingKind) then begin
+    CityBuildingKind := GameSystem.BuildingKinds.AddItem('City');
+    CityBuildingKind.SpecialType := stCity;
+  end;
+  if not Assigned(Cell.Building) then begin
+    Cell.Building := Buildings.AddItem('City');
+    Cell.Building.Kind := CityBuildingKind;
+    Cell.Building.Game := Self;
+  end;
+end;
+
 procedure TGame.Assign(Source: TGame);
 begin
@@ -502 +515 @@
   DevelMode := Source.DevelMode;
   Players.Assign(Source.Players);
+  Buildings.Assign(Source.Buildings);
   MapType := Source.MapType;
   Map.Assign(Source.Map);
@@ -647 +661 @@
         Units.LoadFromNode(NewNode);
 
+      NewNode := FindNode('Buildings');
+      if Assigned(NewNode) then
+        Buildings.LoadFromNode(NewNode);
+
       Map.Cells.FixRefId;
       Units.FixRefId;
@@ -697 +715 @@
       Units.RecalculateItemsId;
       Players.RecalculateItemsId;
+      Buildings.RecalculateItemsId;
 
       NewNode := OwnerDocument.CreateElement('GameSystem');
@@ -713 +732 @@
       AppendChild(NewNode);
       Units.SaveToNode(NewNode);
+
+      NewNode := OwnerDocument.CreateElement('Buildings');
+      AppendChild(NewNode);
+      Buildings.SaveToNode(NewNode);
     end;
     if ExtractFileDir(FileName) <> '' then
@@ -955 +978 @@
   Map.Clear;
   Units.Clear;
+  Buildings.Clear;
 end;