Changeset 298 for trunk/UGame.pas

Timestamp:

Jul 10, 2019, 5:35:15 PM (5 years ago)

Author:

chronos

Message:

• Added: New item list type reference. Used in players for reference to selected nation.
• Modified: New game players selection migrated to dynamic item/list forms.

File:

• trunk/UGame.pas (modified) (12 diffs)

trunk/UGame.pas

@@ -330 +330 @@
   if not GeneratePlayers then Exit;
 
-  for Player in Players do begin
-    Player.Reset;
-    Player.StartCell := nil;
-  end;
-  I := 0;
-  for Player in Players do
-  with Player do begin
+  for I := 0 to Players.Count - 1 do begin
+    TPlayer(Players[I]).Reset;
+    TPlayer(Players[I]).StartCell := nil;
+  end;
+  for I := 0 to Players.Count - 1 do
+  with TPlayer(Players[I]) do begin
+    Player := TPlayer(Players[I]);
     PlayerMap.Update;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
@@ -342 +342 @@
       if Assigned(Player.StartCell) then begin
         if SymetricMap and (I = 1) then
-          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(Players[0].StartCell)];
+          StartCell := Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)];
 
         if CityEnabled then begin
@@ -358 +358 @@
     InitUnitMoves;
     PlayerMap.CheckVisibility;
-    Inc(I);
   end;
 end;
@@ -411 +410 @@
   Player: TPlayer;
   List: TCells;
-begin
-  for Player in Players do
-  if Assigned(Player.StartCell) then begin
-    Player.StartCell.Weight := 1;
-    Player.StartCell.Mark := True;
-    List := TCells.Create;
-    List.FreeObjects := False;
-    List.Add(Player.StartCell);
-    PropagatePlayerDistance(List);
-    FreeAndNil(List);
+  I: Integer;
+begin
+  for I := 0 to Players.Count - 1 do begin
+    Player := TPlayer(Players[I]);
+    if Assigned(Player.StartCell) then begin
+      Player.StartCell.Weight := 1;
+      Player.StartCell.Mark := True;
+      List := TCells.Create;
+      List.FreeObjects := False;
+      List.Add(Player.StartCell);
+      PropagatePlayerDistance(List);
+      FreeAndNil(List);
+    end;
   end;
 end;
@@ -568 +570 @@
     MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), 5);
     MaxPower := GetValue(DOMString(Path + '/MaxPower'), 99);
+    GameSystemName := string(GetValue(DOMString(Path + '/GameSystemName'), DOMString('')));
     Players.LoadConfig(Config, Path + '/Players');
-    GameSystemName := string(GetValue(DOMString(Path + '/GameSystemName'), DOMString('')));
   end;
 end;
@@ -617 +619 @@
       if Assigned(NewNode) then
         Players.LoadFromNode(NewNode);
-      if Players.Count > 0 then CurrentPlayer := Players[0]
+      if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
         else CurrentPlayer := nil;
 
@@ -628 +630 @@
 
       for I := 0 to Players.Count - 1 do begin
-        Players[I].PlayerMap.Update;
-        Players[I].PlayerMap.CheckVisibility;
+        TPlayer(Players[I]).PlayerMap.Update;
+        TPlayer(Players[I]).PlayerMap.CheckVisibility;
       end;
       ComputePlayerStats;
@@ -700 +702 @@
 begin
   for I := 0 to Players.Count - 1 do
-  with Players[I] do begin
+  with TPlayer(Players[I]) do begin
     TotalUnits := 0;
     TotalCells := 0;
@@ -721 +723 @@
 begin
   for I := 0 to Players.Count - 1 do
-  with Players[I] do begin
+  with TPlayer(Players[I]) do begin
     NewStat := TGameTurnStat.Create;
     NewStat.DiscoveredCells := TotalDiscovered;
@@ -770 +772 @@
       NewPlayerIndex := NewPlayerIndex mod AlivePlayers.Count;
     end;
-    CurrentPlayer := AlivePlayers[NewPlayerIndex];
+    CurrentPlayer := TPlayer(AlivePlayers[NewPlayerIndex]);
   finally
     AlivePlayers.Free;
@@ -895 +897 @@
   I: Integer;
 begin
-  for I := 0 to Players.Count - 1 do Players[I].Clear;
+  for I := 0 to Players.Count - 1 do TPlayer(Players[I]).Clear;
   Map.Clear;
 end;
@@ -922 +924 @@
 
   InitPlayers;
-  if Players.Count > 0 then CurrentPlayer := Players[0]
+  if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
     else CurrentPlayer := nil;