Changeset 146

Timestamp:

Nov 12, 2017, 1:57:59 PM (7 years ago)

Author:

chronos

Message:

• Modified: Use generic lists instead classic untyped lists.

File:

• trunk/UGame.pas (modified) (23 diffs)

trunk/UGame.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, ExtCtrls, Graphics, Contnrs, XMLConf, XMLRead, XMLWrite,
+  Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite,
   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl;
 
@@ -80 +80 @@
   { TCells }
 
-  TCells = class(TObjectList)
+  TCells = class(TFPGObjectList<TCell>)
     Map: TMap;
     procedure FixRefId;
@@ -103 +103 @@
   { TCellLinks }
 
-  TCellLinks = class(TObjectList)
+  TCellLinks = class(TFPGObjectList<TCellLink>)
     Map: TMap;
     function FindByCells(Cell1, Cell2: TCell): TCellLink;
@@ -159 +159 @@
   end;
 
-  TMapAreas = class(TObjectList)
+  TMapAreas = class(TFPGObjectList<TMapArea>)
   end;
 
@@ -222 +222 @@
   { TPlayerCells }
 
-  TPlayerCells = class(TObjectList)
+  TPlayerCells = class(TFPGObjectList<TPlayerCell>)
     Map: TPlayerMap;
     function SearchCell(Cell: TCell): TPlayerCell;
@@ -256 +256 @@
   { TGameTurnStats }
 
-  TGameTurnStats = class(TObjectList)
+  TGameTurnStats = class(TFPGObjectList<TGameTurnStat>)
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
@@ -303 +303 @@
   TComputer = class
     Game: TGame;
-    Targets: TObjectList;
+    //Targets: TFPGObjectList<TPlayer>;
     CellProcessDirection: Boolean;
     procedure AttackNeutral;
@@ -318 +318 @@
   { TPlayers }
 
-  TPlayers = class(TObjectList)
+  TPlayers = class(TFPGObjectList<TPlayer>)
     Game: TGame;
     NewPlayerId: Integer;
@@ -352 +352 @@
   { TUnitMoves }
 
-  TUnitMoves = class(TObjectList)
+  TUnitMoves = class(TFPGObjectList<TUnitMove>)
     Game: TGame;
     procedure LoadFromNode(Node: TDOMNode);
@@ -377 +377 @@
   { TClients }
 
-  TClients = class(TObjectList)
+  TClients = class(TFPGObjectList<TClient>)
     Game: TGame;
     procedure New(Name: string);
@@ -695 +695 @@
 begin
   Cells := TCells.Create;
-  Cells.OwnsObjects := False;
+  Cells.FreeObjects := False;
 end;
 
@@ -713 +713 @@
     // To remove itself from list we need disable owning to not be called twice
     try
-      LastState := Map.CellLinks.OwnsObjects;
-      Map.CellLinks.OwnsObjects := False;
+      LastState := Map.CellLinks.FreeObjects;
+      Map.CellLinks.FreeObjects := False;
       Map.CellLinks.Remove(Self);
     finally
-      Map.CellLinks.OwnsObjects := LastState;
+      Map.CellLinks.FreeObjects := LastState;
     end;
   end;
@@ -799 +799 @@
 begin
   Cells := TCells.Create;
-  Cells.OwnsObjects := False;
+  Cells.FreeObjects := False;
 end;
 
@@ -1610 +1610 @@
     // To remove itself from list we need disable owning to not be called twice
     try
-      LastState := List.OwnsObjects;
-      List.OwnsObjects := False;
+      LastState := List.FreeObjects;
+      List.FreeObjects := False;
       List.Remove(Self);
     finally
-      List.OwnsObjects := LastState;
+      List.FreeObjects := LastState;
     end;
   end;
@@ -1823 +1823 @@
   Player := nil;
   Neighbors := TCells.Create;
-  Neighbors.OwnsObjects := False;
+  Neighbors.FreeObjects := False;
   MovesFrom := TUnitMoves.Create;
-  MovesFrom.OwnsObjects := False;
+  MovesFrom.FreeObjects := False;
   MovesTo := TUnitMoves.Create;
-  MovesTo.OwnsObjects := False;
+  MovesTo.FreeObjects := False;
   Links := TCellLinks.Create;
-  Links.OwnsObjects := False;
+  Links.FreeObjects := False;
 end;
 
@@ -1956 +1956 @@
 end;
 
-function CellCompare(Item1, Item2: Pointer): Integer;
-begin
-  if TCell(Item1).Power > TCell(Item2).Power then Result := 1
-  else if TCell(Item1).Power < TCell(Item2).Power then Result := -1
+function CellCompare(const Item1, Item2: TCell): Integer;
+begin
+  if Item1.Power > Item2.Power then Result := 1
+  else if Item1.Power < Item2.Power then Result := -1
   else Result := 0;
 end;
 
-function CellCompareDescending(Item1, Item2: Pointer): Integer;
-begin
-  if TCell(Item1).Power > TCell(Item2).Power then Result := -1
-  else if TCell(Item1).Power < TCell(Item2).Power then Result := 1
+function CellCompareDescending(const Item1, Item2: TCell): Integer;
+begin
+  if Item1.Power > Item2.Power then Result := -1
+  else if Item1.Power < Item2.Power then Result := 1
   else Result := 0;
 end;
@@ -1985 +1985 @@
   AllCells := Game.Map.Cells;
   TargetCells := TCells.Create;
-  TargetCells.OwnsObjects := False;
+  TargetCells.FreeObjects := False;
 
   // Get list of all attack target cells
@@ -2046 +2046 @@
   AllCells := Game.Map.Cells;
   TargetCells := TCells.Create;
-  TargetCells.OwnsObjects := False;
+  TargetCells.FreeObjects := False;
 
   // Get list of all attack target cells
@@ -2113 +2113 @@
   AllCells := Game.Map.Cells;
   TargetCells := TCells.Create;
-  TargetCells.OwnsObjects := False;
+  TargetCells.FreeObjects := False;
   NewTargetCells := TCells.Create;
-  NewTargetCells.OwnsObjects := False;
+  NewTargetCells.FreeObjects := False;
 
   // Get list of all enemy border cells
@@ -2177 +2177 @@
     TargetCells := NewTargetCells;
     NewTargetCells := TCells.Create;
-    NewTargetCells.OwnsObjects := False;
+    NewTargetCells.FreeObjects := False;
   end;
 
@@ -2218 +2218 @@
 begin
   BorderCells := TCells.Create;
-  BorderCells.OwnsObjects := False;
+  BorderCells.FreeObjects := False;
   AllCells := Game.Map.Cells;
 
@@ -2656 +2656 @@
   Result := nil;
   NewList := TCells.Create;
-  NewList.OwnsObjects := False;
+  NewList.FreeObjects := False;
   NewListVoid := TCells.Create;
-  NewListVoid.OwnsObjects := False;
+  NewListVoid.FreeObjects := False;
 
   for C := 0 to List.Count - 1 do
@@ -2723 +2723 @@
 begin
   List := TCells.Create;
-  List.OwnsObjects := False;
+  List.FreeObjects := False;
 
   BorderList := TCells.Create;
-  BorderList.OwnsObjects := False;
+  BorderList.FreeObjects := False;
 
   // Build area bridges