Changeset 316 for trunk/UMap.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: Code cleanup.

File:

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

trunk/UMap.pas

@@ -1 +1 @@
 unit UMap;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, fgl, UBuilding,
-  XML, UUnit;
+  Classes, SysUtils, Graphics, ExtCtrls, UGeometry, DOM, Generics.Collections,
+  Generics.Defaults, UBuilding, XML, UUnit;
 
 const
@@ -78 +76 @@
   { TCells }
 
-  TCells = class(TFPGObjectList<TCell>)
+  TCells = class(TObjectList<TCell>)
     Map: TMap;
     procedure FixRefId;
@@ -105 +103 @@
   { TCellLinks }
 
-  TCellLinks = class(TFPGObjectList<TCellLink>)
+  TCellLinks = class(TObjectList<TCellLink>)
     Map: TMap;
     function FindByCells(Cell1, Cell2: TCell): TCellLink;
@@ -136 +134 @@
   end;
 
-  TMapAreas = class(TFPGObjectList<TMapArea>)
+  TMapAreas = class(TObjectList<TMapArea>)
   end;
 
@@ -239 +237 @@
 begin
   Cells := TCells.Create;
-  Cells.FreeObjects := False;
+  Cells.OwnsObjects := False;
 end;
 
@@ -253 +251 @@
   end;
   FreeAndNil(Cells);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -336 +334 @@
 begin
   Cells := TCells.Create;
-  Cells.FreeObjects := False;
+  Cells.OwnsObjects := False;
 end;
 
@@ -342 +340 @@
 begin
   FreeAndNil(Cells);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -456 +454 @@
 end;
 
-function CompareCellAngle(const C1, C2: TCell): Integer;
+function CompareCellAngle(constref C1, C2: TCell): Integer;
 begin
   if C1.Angle < C2.Angle then Result := -1
@@ -472 +470 @@
       NeighborCell.Angle := TLine.Create(Cell.PosPx, NeighborCell.PosPx).GetAngle;
 
-    Cell.Neighbors.Sort(CompareCellAngle);
+    Cell.Neighbors.Sort(TComparer<TCell>.Construct(CompareCellAngle));
   end;
 end;
@@ -770 +768 @@
   FreeAndNil(Image);
   FreeAndNil(Cells);
-  inherited Destroy;
+  inherited;
 end;
 
@@ -803 +801 @@
   Result := nil;
   NewList := TCells.Create;
-  NewList.FreeObjects := False;
+  NewList.OwnsObjects := False;
   NewListVoid := TCells.Create;
-  NewListVoid.FreeObjects := False;
+  NewListVoid.OwnsObjects := False;
 
   for C := 0 to List.Count - 1 do
@@ -845 +843 @@
 begin
   List := TCells.Create;
-  List.FreeObjects := False;
+  List.OwnsObjects := False;
 
   BorderList := TCells.Create;
-  BorderList.FreeObjects := False;
+  BorderList.OwnsObjects := False;
 
   // Build area bridges
@@ -1133 +1131 @@
   Player := nil;
   Neighbors := TCells.Create;
-  Neighbors.FreeObjects := False;
+  Neighbors.OwnsObjects := False;
   Links := TCellLinks.Create;
-  Links.FreeObjects := False;
+  Links.OwnsObjects := False;
 end;
 
@@ -1150 +1148 @@
       raise Exception.Create(SCellRemoveNeighborError);
   FreeAndNil(Neighbors);
-  inherited Destroy;
+  inherited;
 end;