- Added generic lists for world items, static items and map items

- Added appropriate compare functions
- Some local cleanups

Client/CentrED.lpi

@@ -281,6 +281,7 @@
     <Linking>
       <Debugging>
         <GenerateDebugInfo Value="True"/>
+        <UseHeaptrc Value="True"/>
       </Debugging>
       <LinkSmart Value="True"/>
       <Options>

Client/ULandscape.pas

@@ -90,7 +90,7 @@ type
     constructor Create(AData: TStream; AIndex: TGenericIndex); overload;
     destructor Destroy; override;
   public
-    Cells: array[0..63] of TList;
+    Cells: array[0..63] of TStaticItemList;
     { Methods }
     function Clone: TSeperatedStaticBlock; override;
     function GetSize: Integer; override;
@@ -149,7 +149,7 @@ type
     function GetMapCell(AX, AY: Word): TMapCell;
     function GetNormals(AX, AY: Word): TNormals;
     function GetStaticBlock(AX, AY: Word): TSeperatedStaticBlock;
-    function GetStaticList(AX, AY: Word): TList;
+    function GetStaticList(AX, AY: Word): TStaticItemList;
     { Events }
     procedure OnRemoveCachedObject(AObject: TObject);
     procedure OnBlocksPacket(ABuffer: TEnhancedMemoryStream);
@@ -166,7 +166,7 @@ type
     property CellWidth: Word read FCellWidth;
     property CellHeight: Word read FCellHeight;
     property MapCell[X, Y: Word]: TMapCell read GetMapCell;
-    property StaticList[X, Y: Word]: TList read GetStaticList;
+    property StaticList[X, Y: Word]: TStaticItemList read GetStaticList;
     property Normals[X, Y: Word]: TNormals read GetNormals;
     property OnChange: TLandscapeChangeEvent read FOnChange write FOnChange;
     property OnMapChanged: TMapChangedEvent read FOnMapChanged write FOnMapChanged;
@@ -183,7 +183,7 @@ type
     function CanWrite(AX, AY: Word): Boolean;
     procedure FillDrawList(ADrawList: TScreenBuffer; AX, AY, AWidth,
       AHeight: Word; AMap, AStatics: Boolean; ANoDraw: Boolean;
-      AAdditionalTiles: TList = nil);
+      AAdditionalTiles: TWorldItemList = nil);
     function GetEffectiveAltitude(ATile: TMapCell): ShortInt;
     function GetLandAlt(AX, AY: Word; ADefault: ShortInt): ShortInt;
     procedure GetNormals(AX, AY: Word; var ANormals: TNormals);
@@ -362,13 +362,13 @@ var
   block: TMemoryStream;
 begin
   inherited Create;
-  FItems := TList.Create;
+  FItems := TStaticItemList.Create(False);
 
   FX := AX;
   FY := AY;
 
   for i := 0 to 63 do
-    Cells[i] := TList.Create;
+    Cells[i] := TStaticItemList.Create;
 
   if (AData <> nil) and (AIndex.Lookup > 0) and (AIndex.Size > 0) then
   begin
@@ -399,18 +399,7 @@ begin
   for i := 0 to 63 do
   begin
     if Cells[i] <> nil then
-    begin
+      FreeAndNil(Cells[i]);
-      for j := 0 to Cells[i].Count - 1 do
-      begin
-        if Cells[i][j] <> nil then
-        begin
-          TStaticItem(Cells[i][j]).Free;
-          Cells[i][j] := nil;
-        end;
-      end;
-      Cells[i].Free;
-      Cells[i] := nil;
-    end;
   end;
 
   inherited Destroy;
@@ -588,7 +577,7 @@ begin
   end;
 end;
 
-function TLandscape.GetStaticList(AX, AY: Word): TList;
+function TLandscape.GetStaticList(AX, AY: Word): TStaticItemList;
 var
   block: TSeperatedStaticBlock;
 begin
@@ -668,7 +657,7 @@ var
   x, y: Word;
   block: TSeperatedStaticBlock;
   staticItem: TStaticItem;
-  targetStaticList: TList;
+  targetStaticList: TStaticItemList;
   i: Integer;
 begin
   x := ABuffer.ReadWord;
@@ -685,10 +674,10 @@ begin
     targetStaticList := block.Cells[(y mod 8) * 8 + x mod 8];
     targetStaticList.Add(staticItem);
     for i := 0 to targetStaticList.Count - 1 do
-      TStaticItem(targetStaticList.Items[i]).UpdatePriorities(
+      targetStaticList.Items[i].UpdatePriorities(
-        ResMan.Tiledata.StaticTiles[TStaticItem(targetStaticList.Items[i]).TileID],
+        ResMan.Tiledata.StaticTiles[targetStaticList.Items[i].TileID],
         i);
-    targetStaticList.Sort(@CompareWorldItems);
+    targetStaticList.Sort(@CompareStaticItems);
     staticItem.Owner := block;
     staticItem.CanBeEdited := CanWrite(x, y);
 
@@ -700,7 +689,7 @@ procedure TLandscape.OnDeleteStaticPacket(ABuffer: TEnhancedMemoryStream);
 var
   block: TSeperatedStaticBlock;
   i: Integer;
-  statics: TList;
+  statics: TStaticItemList;
   staticInfo: TStaticInfo;
   staticItem: TStaticItem;
 begin
@@ -711,7 +700,7 @@ begin
     statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
     for i := 0 to statics.Count - 1 do
     begin
-      staticItem := TStaticItem(statics.Items[i]);
+      staticItem := statics.Items[i];
       if (staticItem.Z = staticInfo.Z) and
          (staticItem.TileID = staticInfo.TileID) and
          (staticItem.Hue = staticInfo.Hue) then
@@ -730,7 +719,7 @@ procedure TLandscape.OnElevateStaticPacket(ABuffer: TEnhancedMemoryStream);
 var
   block: TSeperatedStaticBlock;
   i,j : Integer;
-  statics: TList;
+  statics: TStaticItemList;
   staticInfo: TStaticInfo;
   staticItem: TStaticItem;
 begin
@@ -741,17 +730,17 @@ begin
     statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
     for i := 0 to statics.Count - 1 do
     begin
-      staticItem := TStaticItem(statics.Items[i]);
+      staticItem := statics.Items[i];
       if (staticItem.Z = staticInfo.Z) and
          (staticItem.TileID = staticInfo.TileID) and
          (staticItem.Hue = staticInfo.Hue) then
       begin
         staticItem.Z := ABuffer.ReadShortInt;
         for j := 0 to statics.Count - 1 do
-          TStaticItem(statics.Items[j]).UpdatePriorities(
+          statics.Items[j].UpdatePriorities(
-            ResMan.Tiledata.StaticTiles[TStaticItem(statics.Items[j]).TileID],
+            ResMan.Tiledata.StaticTiles[statics.Items[j].TileID],
             j);
-        statics.Sort(@CompareWorldItems);
+        statics.Sort(@CompareStaticItems);
 
         if Assigned(FOnStaticElevated) then FOnStaticElevated(staticItem);
 
@@ -765,7 +754,7 @@ procedure TLandscape.OnMoveStaticPacket(ABuffer: TEnhancedMemoryStream);
 var
   sourceBlock, targetBlock: TSeperatedStaticBlock;
   i: Integer;
-  statics: TList;
+  statics: TStaticItemList;
   staticInfo: TStaticInfo;
   staticItem: TStaticItem;
   newX, newY: Word;
@@ -783,7 +772,7 @@ begin
     i := 0;
     while (i < statics.Count) and (staticItem = nil) do
     begin
-      staticItem := TStaticItem(statics.Items[i]);
+      staticItem := statics.Items[i];
       if (staticItem.Z <> staticInfo.Z) or
          (staticItem.TileID <> staticInfo.TileID) or
          (staticItem.Hue <> staticInfo.Hue) then
@@ -815,7 +804,7 @@ begin
       TStaticItem(statics.Items[i]).UpdatePriorities(
         ResMan.Tiledata.StaticTiles[TStaticItem(statics.Items[i]).TileID],
         i);
-    statics.Sort(@CompareWorldItems);
+    statics.Sort(@CompareStaticItems);
     staticItem.Owner := targetBlock;
     staticItem.CanBeEdited := CanWrite(newX, newY);
 
@@ -827,7 +816,7 @@ procedure TLandscape.OnHueStaticPacket(ABuffer: TEnhancedMemoryStream);
 var
   block: TSeperatedStaticBlock;
   i : Integer;
-  statics: TList;
+  statics: TStaticItemList;
   staticInfo: TStaticInfo;
   staticItem: TStaticItem;
 begin
@@ -838,7 +827,7 @@ begin
     statics := block.Cells[(staticInfo.Y mod 8) * 8 + staticInfo.X mod 8];
     for i := 0 to statics.Count - 1 do
     begin
-      staticItem := TStaticItem(statics.Items[i]);
+      staticItem := statics.Items[i];
       if (staticItem.Z = staticInfo.Z) and
          (staticItem.TileID = staticInfo.TileID) and
          (staticItem.Hue = staticInfo.Hue) then
@@ -858,15 +847,15 @@ end;
 
 procedure TLandscape.FillDrawList(ADrawList: TScreenBuffer; AX, AY, AWidth,
   AHeight: Word; AMap, AStatics: Boolean; ANoDraw: Boolean;
-  AAdditionalTiles: TList = nil);
+  AAdditionalTiles: TWorldItemList = nil);
 var
   drawMapCell: TMapCell;
-  drawStatics: TList;
+  drawStatics: TStaticItemList;
   i, x, y: Integer;
-  tempDrawList: TList;
+  tempDrawList: TWorldItemList;
 begin
   ADrawList.Clear;
-  tempDrawList := TList.Create;
+  tempDrawList := TWorldItemList.Create(False);;
   for x := AX to AX + AWidth do
   begin
     for y := AY to AY + AWidth do
@@ -889,8 +878,8 @@ begin
         if drawStatics <> nil then
           for i := 0 to drawStatics.Count - 1 do
           begin
-            TStaticItem(drawStatics[i]).UpdatePriorities(
+            drawStatics[i].UpdatePriorities(
-              ResMan.Tiledata.StaticTiles[TStaticItem(drawStatics[i]).TileID],
+              ResMan.Tiledata.StaticTiles[drawStatics[i].TileID],
               ADrawList.GetSerial);
             tempDrawList.Add(drawStatics[i]);
           end;
@@ -898,8 +887,8 @@ begin
     end;
   end;
 
-  if AAdditionalTiles <> nil then
+  for i := 0 to AAdditionalTiles.Count - 1 do
-    tempDrawList.AddList(AAdditionalTiles);
+    tempDrawList.Add(AAdditionalTiles[i]);
 
   tempDrawList.Sort(@CompareWorldItems);
   for i := 0 to tempDrawList.Count - 1 do
@@ -1018,7 +1007,7 @@ end;
 procedure TLandscape.MoveStatic(AStatic: TStaticItem; AX, AY: Word);
 var
   sourceBlock, targetBlock: TSeperatedStaticBlock;
-  targetStaticList: TList;
+  targetStaticList: TStaticItemList;
   i: Integer;
 begin
   if (AX >= 0) and (AX <= FCellWidth) and (AY >= 0) and (AY <= FCellHeight) then
@@ -1031,10 +1020,10 @@ begin
       targetStaticList := targetBlock.Cells[(AY mod 8) * 8 + AX mod 8];
       targetStaticList.Add(AStatic);
       for i := 0 to targetStaticList.Count - 1 do
-        TStaticItem(targetStaticList.Items[i]).UpdatePriorities(
+        targetStaticList.Items[i].UpdatePriorities(
-          ResMan.Tiledata.StaticTiles[TStaticItem(targetStaticList.Items[i]).TileID],
+          ResMan.Tiledata.StaticTiles[targetStaticList.Items[i].TileID],
           i);
-      targetStaticList.Sort(@CompareWorldItems);
+      targetStaticList.Sort(@CompareStaticItems);
       AStatic.UpdatePos(AX, AY, AStatic.Z);
       AStatic.Owner := targetBlock;
     end;
@@ -1309,7 +1298,7 @@ begin
   Result^.State := ssNormal;
   Result^.Highlighted := False;
 
-  if (FShortCuts[0] = nil) or (CompareWorldItems(AItem, FShortCuts[0]) < 0) then
+  if (FShortCuts[0] = nil) or (CompareWorldItems(AItem, FShortCuts[0]^.Item) < 0) then
   begin
     if FShortCuts[0] = nil then
       FShortCuts[-1] := Result;  //Update last item
@@ -1321,7 +1310,7 @@ begin
     //find best entry point
     shortcut := 0;
     while (shortcut <= 10) and (FShortCuts[shortcut] <> nil) and
-      (CompareWorldItems(AItem, FShortCuts[shortcut]) >= 0) do
+      (CompareWorldItems(AItem, FShortCuts[shortcut]^.Item) >= 0) do
     begin
       current := FShortCuts[shortcut];
       Inc(shortcut);

Client/UfrmMain.pas

@@ -278,7 +278,7 @@ type
     FCurrentTile: TWorldItem;
     FSelectedTile: TWorldItem;
     FGhostTile: TWorldItem;
-    FVirtualTiles: TObjectList;
+    FVirtualTiles: TWorldItemList;
     FVLayerMaterial: TMaterial;
     FOverlayUI: TOverlayUI;
     FLocationsFile: string;
@@ -776,7 +776,7 @@ begin
     virtualLayerGraphic);
   virtualLayerGraphic.Free;
 
-  FVirtualTiles := TObjectList.Create(True);
+  FVirtualTiles := TWorldItemList.Create(True);
   
   FRandomPresetLocation := IncludeTrailingPathDelimiter(ExtractFilePath(Application.ExeName)) + 'RandomPresets' + PathDelim;
   if not DirectoryExists(FRandomPresetLocation) then CreateDir(FRandomPresetLocation);

UOLib/UMap.pas

@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2007 Andreas Schneider
+ *      Portions Copyright 2009 Andreas Schneider
  *)
 unit UMap;
 
@@ -30,13 +30,16 @@ unit UMap;
 interface
 
 uses
-  SysUtils, Classes, UMulBlock, UWorldItem;
+  SysUtils, Classes, fgl, UMulBlock, UWorldItem;
 
 const
   MapCellSize = 3;
   MapBlockSize = 4 + (64 * MapCellSize);
 
 type
+
+  { TMapCell }
+
   TMapCell = class(TWorldItem)
     constructor Create(AOwner: TWorldBlock; AData: TStream; AX, AY: Word); overload;
     constructor Create(AOwner: TWorldBlock; AData: TStream); overload;
@@ -46,6 +49,11 @@ type
   public
     property Altitude: ShortInt read FZ write FZ;
   end;
+
+  TMapCellList = specialize TFPGObjectList<TMapCell>;
+
+  { TMapBlock }
+
   TMapBlock = class(TWorldBlock)
     constructor Create(AData: TStream; AX, AY: Word); overload;
     constructor Create(AData: TStream); overload;
@@ -74,6 +82,8 @@ begin
   Result := group * MapBlockSize + 4 + tile * MapCellSize;
 end;
 
+{ TMapCell }
+
 constructor TMapCell.Create(AOwner: TWorldBlock; AData: TStream; AX, AY: Word);
 begin
   inherited Create(AOwner);
@@ -112,6 +122,8 @@ begin
   Result := MapCellSize;
 end;
 
+{ TMapBlock }
+
 constructor TMapBlock.Create(AData: TStream; AX, AY: Word);
 var
   iX, iY: Integer;

UOLib/UStatics.pas

@@ -30,7 +30,7 @@ unit UStatics;
 interface
 
 uses
-  SysUtils, Classes, UGenericIndex, UWorldItem, UTiledata;
+  SysUtils, Classes, fgl, UGenericIndex, UWorldItem, UTiledata;
 
 type
   { TStaticItem }
@@ -58,6 +58,8 @@ type
     procedure Write(AData: TStream); override;
   end;
 
+  TStaticItemList = specialize TFPGObjectList<TStaticItem>;
+
   { TStaticBlock}
 
   TStaticBlock = class(TWorldBlock)
@@ -66,10 +68,10 @@ type
     destructor Destroy; override;
   protected
     { Members }
-    FItems: TList;
+    FItems: TStaticItemList;
   public
     { Fields }
-    property Items: TList read FItems write FItems;
+    property Items: TStaticItemList read FItems write FItems;
 
     { Methods }
     function Clone: TStaticBlock; override;
@@ -79,8 +81,15 @@ type
     procedure Write(AData: TStream); override;
   end;
 
+function CompareStaticItems(const AStatic1, AStatic2: TStaticItem): Integer;
+
 implementation
 
+function CompareStaticItems(const AStatic1, AStatic2: TStaticItem): Integer;
+begin
+  Result := CompareWorldItems(AStatic1, AStatic2);
+end;
+
 { TStaticItem }
 
 constructor TStaticItem.Create(AOwner: TWorldBlock; AData: TStream; ABlockX, ABlockY: Word);
@@ -176,8 +185,8 @@ begin
   FX := AX;
   FY := AY;
 
-  FItems := TList.Create;
+  FItems := TStaticItemList.Create(True);
-  if assigned(AData) and (AIndex.Lookup > 0) and (AIndex.Size > 0) then
+  if (AData <> nil) and (AIndex.Lookup > 0) and (AIndex.Size > 0) then
   begin
     AData.Position := AIndex.Lookup;
     block := TMemoryStream.Create;
@@ -198,17 +207,7 @@ destructor TStaticBlock.Destroy;
 var
   i: Integer;
 begin
-  if Assigned(FItems) then
+  FreeAndNil(FItems);
-  begin
-    for i := 0 to FItems.Count - 1 do
-      if Assigned(FItems[i]) then
-      begin
-        TStaticItem(FItems[i]).Free;
-        FItems[i] := nil;
-      end;
-    FItems.Free;
-    FItems := nil;
-  end;
   inherited;
 end;
 
@@ -218,7 +217,7 @@ var
 begin
   Result := TStaticBlock.Create(nil, nil, FX, FY);
   for i := 0 to FItems.Count - 1 do
-    Result.FItems.Add(TStaticItem(FItems.Items[i]).Clone);
+    Result.FItems.Add(FItems.Items[i].Clone);
 end;
 
 function TStaticBlock.GetSize: Integer;
@@ -231,14 +230,12 @@ var
   i: Integer;
 begin
   for i := FItems.Count - 1 downto 0 do
-  begin
+    FItems[i].Write(AData);
-    TStaticItem(FItems[i]).Write(AData);
-  end;
 end;
 
 procedure TStaticBlock.Sort;
 begin
-  FItems.Sort(@CompareWorldItems);
+  FItems.Sort(@CompareStaticItems);
 end;
 
 procedure TStaticBlock.Write(AData: TStream);
@@ -246,7 +243,7 @@ var
   i: Integer;
 begin
   for i := 0 to FItems.Count - 1 do
-    TStaticItem(FItems[i]).Write(AData);
+    FItems[i].Write(AData);
 end;
 
 end.

UOLib/UWorldItem.pas

@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2007 Andreas Schneider
+ *      Portions Copyright 2009 Andreas Schneider
  *)
 unit UWorldItem;
 
@@ -30,7 +30,7 @@ unit UWorldItem;
 interface
 
 uses
-  Classes, UMulBlock;
+  Classes, fgl, UMulBlock;
 
 type
   TWorldBlock = class;
@@ -79,6 +79,8 @@ type
     property PrioritySolver: Integer read FPrioritySolver write FPrioritySolver;
   end;
 
+  TWorldItemList = specialize TFPGObjectList<TWorldItem>;
+
   { TWorldBlock }
 
   TWorldBlock = class(TMulBlock)
@@ -103,39 +105,39 @@ type
 
   TVirtualTile = class(TWorldItem);
 
-function CompareWorldItems(AItem1, AItem2: Pointer): Integer;
+function CompareWorldItems(const AItem1, AItem2: TWorldItem): Integer;
 
 implementation
 
 uses
   UMap, UStatics;
 
-function CompareWorldItems(AItem1, AItem2: Pointer): Integer;
+function CompareWorldItems(const AItem1, AItem2: TWorldItem): Integer;
 begin
-  if TWorldItem(AItem1).X <> TWorldItem(AItem2).X then
+  if AItem1.X <> AItem2.X then
-    Exit(TWorldItem(AItem1).X - TWorldItem(AItem2).X);
+    Exit(AItem1.X - AItem2.X);
 
-  if TWorldItem(AItem1).Y <> TWorldItem(AItem2).Y then
+  if AItem1.Y <> AItem2.Y then
-    Exit(TWorldItem(AItem1).Y - TWorldItem(AItem2).Y);
+    Exit(AItem1.Y - AItem2.Y);
 
-  Result := TWorldItem(AItem1).Priority - TWorldItem(AItem2).Priority;
+  Result := AItem1.Priority - AItem2.Priority;
   if Result = 0 then
   begin
-    if (TObject(AItem1) is TMapCell) and (TObject(AItem2) is TStaticItem) then
+    if (AItem1 is TMapCell) and (AItem2 is TStaticItem) then
       Result := -1
-    else if (TObject(AItem1) is TStaticItem) and (TObject(AItem2) is TMapCell) then
+    else if (AItem1 is TStaticItem) and (AItem2 is TMapCell) then
       Result := 1
-    else if (TObject(AItem1) is TMapCell) and (TObject(AItem2) is TVirtualTile) then
+    else if (AItem1 is TMapCell) and (AItem2 is TVirtualTile) then
       Result := -1
-    else if (TObject(AItem1) is TVirtualTile) and (TObject(AItem2) is TMapCell) then
+    else if (AItem1 is TVirtualTile) and (AItem2 is TMapCell) then
       Result := 1;
   end;
 
   if Result = 0 then
-    Result := TWorldItem(AItem1).PriorityBonus - TWorldItem(AItem2).PriorityBonus;
+    Result := AItem1.PriorityBonus - AItem2.PriorityBonus;
 
   if Result = 0 then
-    Result := TWorldItem(AItem1).PrioritySolver - TWorldItem(AItem2).PrioritySolver;
+    Result := AItem1.PrioritySolver - AItem2.PrioritySolver;
 end;
 
 { TWorldItem }