Changeset 398

Timestamp:

Jan 6, 2025, 10:27:05 AM (3 days ago)

Author:

chronos

Message:

• 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.

Location:

trunk

Files:

• Game.pas (modified) (1 diff)
• Map.pas (modified) (1 diff)
• Player.pas (modified) (1 diff)
• Units.pas (modified) (1 diff)

trunk/Game.pas

@@ -11 +11 @@
   DefaultPlayerStartUnits = 5;
   MinPlayerCount = 1;
-  MaxPlayerCount = 8;
+  MaxPlayerCount = 12;
   GameFileExt = '.xtg';
 

trunk/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);

trunk/Player.pas

@@ -209 +209 @@
 
 const
-  PlayerColors: array[0..11] of TColor = (clBlue, clRed, clGreen, clYellow,
+  clDarkYellow = $00C0C0;
+  PlayerColors: array[0..11] of TColor = (clBlue, clRed, clGreen, clDarkYellow,
     clFuchsia, clAqua, clOlive, clMaroon, clNavy, clPurple, clTeal, clGray);
 

trunk/Units.pas

@@ -188 +188 @@
 procedure TUnit.FixRefId;
 begin
-  Player := TGame(Game).Players.FindById(PlayerId);
-  Kind := TGame(Game).GameSystem.UnitKinds.FindById(KindId);
+  if PlayerId <> 0 then begin
+    Player := TGame(Game).Players.FindById(PlayerId);
+    if not Assigned(Player) then
+      raise Exception.Create('Referenced player id ' + IntToStr(PlayerId) + ' not found.');
+  end else Player := nil;
+
+  if KindId <> 0 then begin
+    Kind := TGame(Game).GameSystem.UnitKinds.FindById(KindId);
+    if not Assigned(Kind) then
+      raise Exception.Create('Referenced unit kind id ' + IntToStr(KindId) + ' not found.');
+  end else Kind := nil;
 end;