Changeset 344 for trunk/Game.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/Game.pas (modified) (13 diffs)

trunk/Game.pas

@@ -295 +295 @@
 var
   Cell: TCell;
-  NewPower: Integer;
 begin
   // Randomize map terrain
@@ -317 +316 @@
     NewPower := Random(MaxNeutralUnits + 1);
     if (NewPower > 0) and not Assigned(OneUnit) then begin
-      OneUnit := Units.AddNew(TUnitKind(GameSystem.UnitKinds[0]), NewPower);
+      OneUnit := Units.AddNew(GameSystem.UnitKinds[0], NewPower);
     end;
     Player := nil;
@@ -330 +329 @@
   with Cell do begin
     if (Terrain = ttNormal) and CityEnabled and (Random < CityPercentage / 100) then begin
-      Building := TBuilding(Buildings.AddItem('City'));
-      Building.Kind := TBuildingKind(GameSystem.BuildingKinds.FindBySpecialType(stCity));
+      Building := Buildings.AddItem('City');
+      Building.Kind := GameSystem.BuildingKinds.FindBySpecialType(stCity);
     end;
   end;
@@ -344 +343 @@
 
   for I := 0 to Players.Count - 1 do begin
-    TPlayer(Players[I]).Reset;
-    TPlayer(Players[I]).StartCell := nil;
+    Players[I].Reset;
+    Players[I].StartCell := nil;
   end;
   for I := 0 to Players.Count - 1 do
-  with TPlayer(Players[I]) do begin
-    Player := TPlayer(Players[I]);
+  with Players[I] do begin
+    Player := Players[I];
     PlayerMap.Update;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
@@ -355 +354 @@
       if Assigned(Player.StartCell) then begin
         if SymetricMap and (I = 1) then
-          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)];
+          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
 
         if CityEnabled then begin
-          StartCell.Building := TBuilding(Buildings.AddItem('City'));
-          StartCell.Building.Kind := TBuildingKind(GameSystem.BuildingKinds.FindBySpecialType(stCity));
+          StartCell.Building := Buildings.AddItem('City');
+          StartCell.Building.Kind := GameSystem.BuildingKinds.FindBySpecialType(stCity);
         end;
         StartCell.Player := Player;
         if GameSystem.UnitKinds.Count > 0 then begin
           if not Assigned(StartCell.OneUnit) then
-            StartCell.OneUnit := Self.Units.AddNew(TUnitKind(GameSystem.UnitKinds[0]), Player.StartUnits);
+            StartCell.OneUnit := Self.Units.AddNew(GameSystem.UnitKinds[0], Player.StartUnits);
           StartCell.OneUnit.Power := Player.StartUnits;
-          StartCell.OneUnit.Kind := TUnitKind(GameSystem.UnitKinds[0]);
+          StartCell.OneUnit.Kind := GameSystem.UnitKinds[0];
           StartCell.OneUnit.Player := Player;
         end;
@@ -428 +427 @@
 begin
   for I := 0 to Players.Count - 1 do begin
-    Player := TPlayer(Players[I]);
+    Player := Players[I];
     if Assigned(Player.StartCell) then begin
       Player.StartCell.Weight := 1;
@@ -633 +632 @@
       if Assigned(NewNode) then
         Players.LoadFromNode(NewNode);
-      if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+      if Players.Count > 0 then CurrentPlayer := Players[0]
         else CurrentPlayer := nil;
 
@@ -644 +643 @@
 
       for I := 0 to Players.Count - 1 do begin
-        TPlayer(Players[I]).PlayerMap.Update;
-        TPlayer(Players[I]).PlayerMap.CheckVisibility;
+        Players[I].PlayerMap.Update;
+        Players[I].PlayerMap.CheckVisibility;
       end;
       ComputePlayerStats;
@@ -742 +741 @@
 begin
   for I := 0 to Players.Count - 1 do
-  with TPlayer(Players[I]) do begin
+  with Players[I] do begin
     TotalUnits := 0;
     TotalCells := 0;
@@ -763 +762 @@
 begin
   for I := 0 to Players.Count - 1 do
-  with TPlayer(Players[I]) do begin
+  with Players[I] do begin
     NewStat := TGameTurnStat.Create;
     NewStat.DiscoveredCells := TotalDiscovered;
@@ -804 +803 @@
       NewPlayerIndex := NewPlayerIndex mod AlivePlayers.Count;
     end;
-    CurrentPlayer := TPlayer(AlivePlayers[NewPlayerIndex]);
+    CurrentPlayer := AlivePlayers[NewPlayerIndex];
   finally
     AlivePlayers.Free;
@@ -931 +930 @@
   I: Integer;
 begin
-  for I := 0 to Players.Count - 1 do TPlayer(Players[I]).Clear;
+  for I := 0 to Players.Count - 1 do Players[I].Clear;
   Map.Clear;
   Units.Clear;
@@ -960 +959 @@
 
   InitPlayers;
-  if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+  if Players.Count > 0 then CurrentPlayer := Players[0]
     else CurrentPlayer := nil;