Changeset 401 for tags/1.4.0/Map.pas

Timestamp:

Jan 6, 2025, 11:12:12 AM (3 days ago)

Author:

chronos

Message:

Merged revision(s) 396-400 from trunk:

• Fixed: Charts form chart was not drawn on the initial show.
• Fixed: Run Randomize only once at startup.
• Fixed: Store current state of RandSeed to game save.
• Fixed: Load/store RandSeed as its Cardinal type instead of Integer.
• Modified: Maximum number of player set to 12.
• Fixed: Standard yellow color is too bright and not readable with white text. Used darker yellow instead.
• Fixed: Integrity checks for id references loaded from game file.
• Fixed: Wrong players and units id recalculation during game save causing bad references.
• Modified: Set new created players as computer.
• Fixed: Scale charts line width.
• Fixed: Item form made bigger to avoid showing scrollbars.
• Fixed: Item form string control made shorter.

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Map.pas (modified) (1 diff)

tags/1.4.0/Map.pas

@@ -1058 +1058 @@
   Cell: TCell;
 begin
-  Player := TGame(Map.Game).Players.FindById(PlayerId);
-  OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
+  if PlayerId <> 0 then begin
+    Player := TGame(Map.Game).Players.FindById(PlayerId);
+    if not Assigned(Player) then
+      raise Exception.Create('Referenced player id ' + IntToStr(PlayerId) + ' not found.');
+  end else Player := nil;
+
+  if OneUnitId <> 0 then begin
+    OneUnit := TGame(Map.Game).Units.FindById(OneUnitId);
+    if not Assigned(OneUnit) then
+      raise Exception.Create('Referenced unit id ' + IntToStr(OneUnitId) + ' not found.');
+  end else OneUnit := nil;
 
   Neighbors.Count := Length(NeighborsId);