Changeset 316 for trunk/UClientAI.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

File:

• trunk/UClientAI.pas (modified) (8 diffs)

trunk/UClientAI.pas

@@ -1 +1 @@
 unit UClientAI;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, UGameClient, UGame, Math, UPlayer, UMap;
+  Classes, SysUtils, UGameClient, UGame, Math, UPlayer, UMap, Generics.Defaults;
 
 type
@@ -53 +51 @@
   AllCells := ControlPlayer.PlayerMap.Cells;
   TargetCells := TPlayerCells.Create;
-  TargetCells.FreeObjects := False;
+  TargetCells.OwnsObjects := False;
 
   // Get list of all attack target cells
@@ -70 +68 @@
   // Sort ascending to attack cells with lower power first
   // Low power cells are better for expanding our territory
-  TargetCells.Sort(CellCompare);
+  TargetCells.Sort(TComparer<TPlayerCell>.Construct(CellCompare));
 
   for Cell in TargetCells do
@@ -113 +111 @@
   DefendCount: Integer;
 begin
-if ControlPlayer.Defensive then Exit;
+  if ControlPlayer.Defensive then Exit;
 
   AllCells := ControlPlayer.PlayerMap.Cells;
   TargetCells := TPlayerCells.Create;
-  TargetCells.FreeObjects := False;
+  TargetCells.OwnsObjects := False;
 
   // Get list of all attack target cells
@@ -134 +132 @@
   // Sort descending to attack cells with higher power first
   // Higher power enemy cells can grow faster and is more dangerous
-  TargetCells.Sort(CellCompareDescending);
+  TargetCells.Sort(TComparer<TPlayerCell>.Construct(CellCompareDescending));
 
   for TargetCell in TargetCells do begin
@@ -188 +186 @@
   AllCells := ControlPlayer.PlayerMap.Cells;
   TargetCells := TPlayerCells.Create;
-  TargetCells.FreeObjects := False;
+  TargetCells.OwnsObjects := False;
   NewTargetCells := TPlayerCells.Create;
-  NewTargetCells.FreeObjects := False;
+  NewTargetCells.OwnsObjects := False;
 
   // Get list of all enemy border cells
@@ -252 +250 @@
     TargetCells := NewTargetCells;
     NewTargetCells := TPlayerCells.Create;
-    NewTargetCells.FreeObjects := False;
+    NewTargetCells.OwnsObjects := False;
   end;
 
@@ -293 +291 @@
 begin
   BorderCells := TPlayerCells.Create;
-  BorderCells.FreeObjects := False;
+  BorderCells.OwnsObjects := False;
   AllCells := ControlPlayer.PlayerMap.Cells;