Changeset 322 for trunk

Timestamp:

Jun 25, 2024, 1:15:02 AM (5 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• GameSystem.pas (modified) (2 diffs)
• Map.pas (modified) (4 diffs)
• Player.pas (modified) (2 diffs)

trunk/GameSystem.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Generics.Collections, &Unit, DOM, XMLRead, XMLWrite, XML, XMLConf,
-  FileUtil, LazFileUtils, MapType, Nation, Building;
+  FileUtil, LazFileUtils, MapType, Nation, Building, ItemList;
 
 type
@@ -69 +69 @@
 begin
   I := 0;
-  while (I < Count) and (TGameSystem(Items[I]).GetName <> Name) do Inc(I);
+  while (I < Count) and (Items[I].GetName <> Name) do Inc(I);
   if I < Count then Result := Items[I]
     else Result := nil;

trunk/Map.pas

@@ -262 +262 @@
   I := 0;
   while (I < Count) do begin
-    if ((TCellLink(Items[I]).Cells[0] = Cell1) and (TCellLink(Items[I]).Cells[1] = Cell2)) or
-    ((TCellLink(Items[I]).Cells[0] = Cell2) and (TCellLink(Items[I]).Cells[1] = Cell1)) then
+    if ((Items[I].Cells[0] = Cell1) and (Items[I].Cells[1] = Cell2)) or
+    ((Items[I].Cells[0] = Cell2) and (Items[I].Cells[1] = Cell1)) then
       Break;
     Inc(I);
   end;
-  if I < Count then Result := TCellLink(Items[I])
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -308 +308 @@
 begin
   for I := 0 to Count - 1 do
-  with TCellLink(Items[I]) do begin
+  with Items[I] do begin
     NewNode2 := Node.OwnerDocument.CreateElement('CellLink');
     Node.AppendChild(NewNode2);
@@ -545 +545 @@
 procedure TMap.LoadFromFile(FileName: string);
 begin
-
 end;
 
 procedure TMap.SaveToFile(FileName: string);
 begin
-
 end;
 
@@ -851 +849 @@
   if Areas.Count > 1 then
   for I := 0 to Areas.Count - 1 do
-  with TMapArea(Areas[I]) do begin
+  with Areas[I] do begin
     GetBorderCells(BorderList);
     if BorderList.Count > 0 then

trunk/Player.pas

@@ -1277 +1277 @@
   with TGame(Game).Map do
   for I := 0 to Cells.Count - 1 do
-  with TCell(Cells[I]) do begin
+  with Cells[I] do begin
     if (Player = Self) and ((TGame(Game).GrowCells = gcPlayerAll) or
     ((TGame(Game).GrowCells = gcPlayerCities) and (Assigned(Building) and (Building.Kind.SpecialType = stCity)))) then begin
@@ -1283 +1283 @@
         NewUnit := TGame(Game).Units.AddNew(TUnitKind(TGame(Game).GameSystem.UnitKinds.First), 0);
         NewUnit.Player := Self;
-        NewUnit.MapCell := TCell(Cells[I]);
+        NewUnit.MapCell := Cells[I];
         Units.Add(NewUnit);
       end;