Changeset 316 for trunk/UPlayer.pas

Timestamp:

Jun 19, 2024, 11:53:06 PM (4 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/UPlayer.pas (modified) (15 diffs)

trunk/UPlayer.pas

@@ -1 +1 @@
 unit UPlayer;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, Graphics, UMap, DOM, fgl, XMLConf, XML, Math,
-  UGeometry, UUnit, UNation, UItemList;
+  Classes, SysUtils, Graphics, UMap, DOM, Generics.Collections, Generics.Defaults,
+  XMLConf, XML, Math, UGeometry, UUnit, UNation, UItemList;
 
 type
@@ -38 +36 @@
   { TPlayerCells }
 
-  TPlayerCells = class(TFPGObjectList<TPlayerCell>)
+  TPlayerCells = class(TObjectList<TPlayerCell>)
     Map: TPlayerMap;
     function FindByCellId(Id: Integer): TPlayerCell;
@@ -84 +82 @@
   { TGameTurnStats }
 
-  TGameTurnStats = class(TFPGObjectList<TGameTurnStat>)
+  TGameTurnStats = class(TObjectList<TGameTurnStat>)
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -192 +190 @@
   { TUnitMoves }
 
-  TUnitMoves = class(TFPGObjectList<TUnitMove>)
+  TUnitMoves = class(TObjectList<TUnitMove>)
     Game: TObject; //TGame;
     Player: TPlayer;
@@ -200 +198 @@
   end;
 
-function CellCompare(const Item1, Item2: TPlayerCell): Integer;
-function CellCompareDescending(const Item1, Item2: TPlayerCell): Integer;
+function CellCompare(constref Item1, Item2: TPlayerCell): Integer;
+function CellCompareDescending(constref Item1, Item2: TPlayerCell): Integer;
 
 
@@ -225 +223 @@
   SDefensive = 'Defensive';
 
-function ComparePointer(const Item1, Item2: Integer): Integer;
+function ComparePointer(constref Item1, Item2: Integer): Integer;
 begin
   Result := -CompareValue(Item1, Item2);
@@ -311 +309 @@
 begin
   MovesFrom := TUnitMoves.Create;
-  MovesFrom.FreeObjects := False;
+  MovesFrom.OwnsObjects := False;
   MovesTo := TUnitMoves.Create;
-  MovesTo.FreeObjects := False;
+  MovesTo.OwnsObjects := False;
   Neighbors := TPlayerCells.Create;
-  Neighbors.FreeObjects := False;
+  Neighbors.OwnsObjects := False;
 end;
 
@@ -334 +332 @@
       raise Exception.Create(SCellRemoveNeighborError);
   FreeAndNil(Neighbors);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -480 +478 @@
 begin
   FreeAndNil(Cells);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -718 +716 @@
   CellTo := nil;
   List := nil;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -864 +862 @@
   S: string;
   I: Integer;
-  AttackRolls: TFPGList<Integer>;
-  DefendRolls: TFPGList<Integer>;
-begin
-  AttackRolls := TFPGList<Integer>.Create;
-  DefendRolls := TFPGList<Integer>.Create;
+  AttackRolls: TList<Integer>;
+  DefendRolls: TList<Integer>;
+begin
+  AttackRolls := TList<Integer>.Create;
+  DefendRolls := TList<Integer>.Create;
   if AttackPower < 1 then
     raise Exception.Create(SAttackerPowerPositive);
@@ -884 +882 @@
       AttackRolls[I] := Random(7);
     end;
-    AttackRolls.Sort(ComparePointer);
+    AttackRolls.Sort(TComparer<Integer>.Construct(ComparePointer));
     S := 'Att:';
     for I := 0 to AttackerDiceCount - 1 do
@@ -892 +890 @@
       DefendRolls[I] := Random(7);
     end;
-    DefendRolls.Sort(ComparePointer);
+    DefendRolls.Sort(TComparer<Integer>.Construct(ComparePointer));
     S := S + ' Def:';
     for I := 0 to DefenderDiceCount - 1 do
@@ -905 +903 @@
 end;
 
-function CellCompare(const Item1, Item2: TPlayerCell): Integer;
+function CellCompare(constref Item1, Item2: TPlayerCell): Integer;
 var
   Stack1, Stack2: Integer;
@@ -918 +916 @@
 end;
 
-function CellCompareDescending(const Item1, Item2: TPlayerCell): Integer;
+function CellCompareDescending(constref Item1, Item2: TPlayerCell): Integer;
 var
   Stack1, Stack2: Integer;