Changeset 344 for trunk/Player.pas

Timestamp:

Dec 23, 2024, 8:16:05 AM (10 hours ago)

Author:

chronos

Message:

• Modified: Improved implementation of TItemList class to be generic class to avoid explicit typecasting.

File:

• trunk/Player.pas (modified) (13 diffs)

trunk/Player.pas

@@ -100 +100 @@
     procedure GetValue(Index: Integer; out Value); override;
     procedure SetValue(Index: Integer; var Value); override;
-    function GetReferenceList(Index: Integer): TItemList; override;
+    function GetReferenceList(Index: Integer): IList<TItem>; override;
     class function GetClassSysName: string; override;
     class function GetClassName: string; override;
@@ -134 +134 @@
   { TPlayers }
 
-  TPlayers = class(TItemList)
+  TPlayers = class(TItemList<TPlayer>)
   public
     Game: TObject; //TGame;
-    class function GetItemClass: TItemClass; override;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
-    function CreateItem(Name: string = ''): TItem; override;
+    function CreateItem(Name: string = ''): TPlayer; override;
     function GetFirstHuman: TPlayer;
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -488 +487 @@
   Result := 0;
   for I := 0 to Count - 1 do
-    if TPlayer(Items[I]).IsAlive then Inc(Result);
+    if Items[I].IsAlive then Inc(Result);
 end;
 
@@ -497 +496 @@
   Players.Clear;
   for I := 0 to Count - 1 do
-    if TPlayer(Items[I]).IsAlive then Players.Add(TPlayer(Items[I]));
-end;
-
-class function TPlayers.GetItemClass: TItemClass;
-begin
-  Result := TPlayer;
+    if Items[I].IsAlive then Players.Add(Items[I]);
 end;
 
@@ -508 +502 @@
 begin
   AddItem(Name);
-  TPlayer(Last).Color := Color;
-  TPlayer(Last).Mode := Mode;
+  Last.Color := Color;
+  Last.Mode := Mode;
   if Mode = pmComputer then
-    TPlayer(Last).Agressivity := caMedium;
-end;
-
-function TPlayers.CreateItem(Name: string): TItem;
+    Last.Agressivity := caMedium;
+end;
+
+function TPlayers.CreateItem(Name: string): TPlayer;
 begin
   Result := inherited;
-  TPlayer(Result).Game := Game;
+  Result.Game := Game;
 end;
 
@@ -525 +519 @@
 begin
   I := 0;
-  while (I < Count) and (TPlayer(Items[I]).Mode <> pmHuman) do Inc(I);
-  if I < Count then Result := TPlayer(Items[I])
+  while (I < Count) and (Items[I].Mode <> pmHuman) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -544 +538 @@
         Items[I] := CreateItem;
         Items[I].Id := GetNewId;
-        TPlayer(Items[I]).LoadConfig(Config, Path + '/Player' + IntToStr(I));
+        Items[I].LoadConfig(Config, Path + '/Player' + IntToStr(I));
       end;
     end;
@@ -555 +549 @@
 begin
   for I := 0 to Count - 1 do
-    TPlayer(Items[I]).SaveConfig(Config, Path + '/Player' + IntToStr(I));
+    Items[I].SaveConfig(Config, Path + '/Player' + IntToStr(I));
   with Config do begin
     SetValue(DOMString(Path + '/Count'), Count);
@@ -568 +562 @@
   SetLength(Result, 0);
   for I := 0 to Count - 1 do
-    if TPlayer(Items[I]).IsAlive then begin
+    if Items[I].IsAlive then begin
       SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := TPlayer(Items[I]);
+      Result[Length(Result) - 1] := Items[I];
     end;
 end;
@@ -581 +575 @@
   SetLength(Result, 0);
   for I := 0 to Count - 1 do
-    if TPlayer(Items[I]).TotalCities > 0 then begin
+    if Items[I].TotalCities > 0 then begin
       SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := TPlayer(Items[I]);
+      Result[Length(Result) - 1] := Items[I];
     end;
 end;
@@ -828 +822 @@
     Defensive := GetValue(DOMString(Path + '/Defensive'), False);
     Agressivity := TComputerAgressivity(GetValue(DOMString(Path + '/Agressivity'), 0));
-    Nation := TNation(TGame(Game).GameSystem.Nations.FindById(GetValue(DOMString(Path + '/Nation'), 0)));
+    Nation := TGame(Game).GameSystem.Nations.FindById(GetValue(DOMString(Path + '/Nation'), 0));
   end;
 end;
@@ -1228 +1222 @@
 end;
 
-function TPlayer.GetReferenceList(Index: Integer): TItemList;
+function TPlayer.GetReferenceList(Index: Integer): IList<TItem>;
 begin
   if Index = 2 then Result := TGame(Game).GameSystem.Nations
@@ -1272 +1266 @@
     ((TGame(Game).GrowCells = gcPlayerCities) and (Assigned(Building) and (Building.Kind.SpecialType = stCity)))) then begin
       if not Assigned(OneUnit) then begin
-        NewUnit := TGame(Game).Units.AddNew(TUnitKind(TGame(Game).GameSystem.UnitKinds.First), 0);
+        NewUnit := TGame(Game).Units.AddNew(TGame(Game).GameSystem.UnitKinds.First, 0);
         NewUnit.Player := Self;
         NewUnit.MapCell := Cells[I];