Changeset 399

Timestamp:

Jan 6, 2025, 10:48:55 AM (3 days ago)

Author:

chronos

Message:

• Fixed: Wrong players and units id recalculation during game save causing bad references.
• Modified: Set new created players as computer.

Location:

trunk

Files:

• Game.pas (modified) (1 diff)
• Packages/Common/ItemList.pas (modified) (3 diffs)
• Player.pas (modified) (1 diff)
• Units.pas (modified) (1 diff)

trunk/Game.pas

@@ -695 +695 @@
       WriteInteger(RootNode, 'CurrentPlayer', CurrentPlayer.Id);
 
+      Units.RecalculateItemsId;
+      Players.RecalculateItemsId;
+
       NewNode := OwnerDocument.CreateElement('GameSystem');
       AppendChild(NewNode);

trunk/Packages/Common/ItemList.pas

@@ -133 +133 @@
     FBaseItemList: TBaseItemList;
     procedure RecalculateNewId(Reset: Boolean);
-    procedure RecalculateItemsId;
     function BaseGetItem(Index: SizeInt): TItem;
     procedure BaseSetItem(Index: SizeInt; AValue: TItem);
@@ -145 +144 @@
   public
     NewId: Integer;
+    procedure RecalculateItemsId;
     function CreateItem(Name: string = ''): T; virtual;
     function IncrementName(Name: string): string;
@@ -265 +265 @@
   NewNode2: TDOMNode;
 begin
-  RecalculateItemsId;
   for I := 0 to Count - 1 do
   with TItem(Items[I]) do begin

trunk/Player.pas

@@ -558 +558 @@
   Result := inherited;
   Result.Game := Game;
+  Result.Mode := pmComputer;
+  Result.Agressivity := caMedium;
   Result.Color := GetUnusedColor;
 end;

trunk/Units.pas

@@ -114 +114 @@
   NewNode2: TDOMNode;
 begin
-  RecalculateItemsId;
   for I := 0 to Count - 1 do
   with Items[I] do begin