Changeset 394 for tags/1.4.0/Player.pas

Timestamp:

Jan 6, 2025, 12:00:42 AM (4 days ago)

Author:

chronos

Message:

Merged revision(s) 386-393 from trunk:

• Fixed: Previous auto save game was not correctly restored if no game was loaded yet.
• Modified: Use new higher resolution application image in about dialog.
• Modified: Do not zoom all on new game start and game load from file.
• Modified: Allow to resize new game, settings and game system forms to be smaller with scroll box area.
• Modified: Added vector logo and generated raster logo with resolution 256x256.
• Modified: Improved controls layout.
• Fixed: Add new players with different colors.
• Fixed: Apply theme to chart background.
• Fixed: Themed background in New game form rules win conditions.

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Player.pas (modified) (4 diffs)

tags/1.4.0/Player.pas

@@ -137 +137 @@
   public
     Game: TObject; //TGame;
+    function GetPlayerByColor(Color: TColor): TPlayer;
+    function GetUnusedColor: TColor;
     procedure Assign(Source: TItemList<TPlayer>); override;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
@@ -206 +208 @@
   SDefensive = 'Defensive';
 
+const
+  PlayerColors: array[0..11] of TColor = (clBlue, clRed, clGreen, clYellow,
+    clFuchsia, clAqua, clOlive, clMaroon, clNavy, clPurple, clTeal, clGray);
+
 function ComparePointer(constref Item1, Item2: Integer): Integer;
 begin
@@ -502 +508 @@
 end;
 
+function TPlayers.GetPlayerByColor(Color: TColor): TPlayer;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) do begin
+    if Assigned(Items[I]) and (Items[I].Color = Color) then Break;
+    Inc(I);
+  end;
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
+function TPlayers.GetUnusedColor: TColor;
+var
+  I: Integer;
+begin
+  Result := clBlack;
+  for I := 0 to Length(PlayerColors) - 1 do
+    if not Assigned(GetPlayerByColor(PlayerColors[I])) then begin
+      Result := PlayerColors[I];
+      Exit;
+    end;
+end;
+
 procedure TPlayers.Assign(Source: TItemList<TPlayer>);
 var
@@ -526 +557 @@
   Result := inherited;
   Result.Game := Game;
+  Result.Color := GetUnusedColor;
 end;