Changeset 344 for trunk/Building.pas

Timestamp:

Dec 23, 2024, 8:16:05 AM (9 hours ago)

Author:

chronos

Message:

• Modified: Improved implementation of TItemList class to be generic class to avoid explicit typecasting.

File:

• trunk/Building.pas (modified) (4 diffs)

trunk/Building.pas

@@ -27 +27 @@
   { TBuildingKinds }
 
-  TBuildingKinds = class(TItemList)
-    class function GetItemClass: TItemClass; override;
-    function FindBySpecialType(SpecialType: TBuildingSpecialType): TItem;
+  TBuildingKinds = class(TItemList<TBuildingKind>)
+    function FindBySpecialType(SpecialType: TBuildingSpecialType): TBuildingKind;
   end;
 
@@ -46 +45 @@
   { TBuildings }
 
-  TBuildings = class(TItemList)
+  TBuildings = class(TItemList<TBuilding>)
     Game: TObject; // TGame;
-    class function GetItemClass: TItemClass; override;
   end;
 
@@ -67 +65 @@
 uses
   Map;
-
-{ TBuildings }
-
-class function TBuildings.GetItemClass: TItemClass;
-begin
-  Result := TBuilding;
-end;
 
 { TBuilding }
@@ -148 +139 @@
 { TBuildingKinds }
 
-class function TBuildingKinds.GetItemClass: TItemClass;
-begin
-  Result := TBuildingKind;
-end;
-
 function TBuildingKinds.FindBySpecialType(SpecialType: TBuildingSpecialType
-  ): TItem;
+  ): TBuildingKind;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (TBuildingKind(Items[I]).SpecialType <> SpecialType) do Inc(I);
+  while (I < Count) and (Items[I].SpecialType <> SpecialType) do Inc(I);
   if I < Count then Result := Items[I]
     else Result := nil;