Changeset 409 for tags/1.4.0/Map.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)
• Map.pas (modified) (4 diffs)

tags/1.4.0/Map.pas

@@ -48 +48 @@
     Extra: TExtraType;
     OneUnitId: Integer; // Temporary value
+    BuildingId: Integer; // Temporary value
     function Compare(Cell: TCell): Boolean;
     procedure ConnectTo(Cell: TCell);
@@ -1064 +1065 @@
   end else Player := nil;
 
+  if BuildingId <> 0 then begin
+    Building := TGame(Map.Game).Buildings.FindById(BuildingId);
+    if not Assigned(Building) then
+      raise Exception.Create('Referenced building id ' + IntToStr(BuildingId) + ' not found.');
+  end else Building := nil;
+
   if OneUnitId <> 0 then begin
     OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
@@ -1095 +1102 @@
   PosPx.Y := ReadInteger(Node, 'PosY', 0);
   PlayerId := ReadInteger(Node, 'Player', 0);
+  BuildingId := ReadInteger(Node, 'Building', 0);
 
   Node3 := Node.FindNode('Neighbours');
@@ -1135 +1143 @@
     WriteInteger(Node, 'Player', TPlayer(Player).Id)
     else WriteInteger(Node, 'Player', 0);
+  if Assigned(Building) then
+    WriteInteger(Node, 'Building', Building.Id)
+    else WriteInteger(Node, 'Building', 0);
   NewNode := Node.OwnerDocument.CreateElement('Neighbours');
   Node.AppendChild(NewNode);