Changeset 210

Timestamp:

May 23, 2018, 6:09:20 PM (6 years ago)

Author:

chronos

Message:

• Fixed: New turn counting if only one player is alive.

File:

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

trunk/UGame.pas

@@ -354 +354 @@
     Game: TGame;
     NewPlayerId: Integer;
-    function GetAliveCount: Integer;
     function FindById(Id: Integer): TPlayer;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
@@ -360 +359 @@
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
-    constructor Create;
+    constructor Create(FreeObjects: Boolean = True);
     function GetFirstHuman: TPlayer;
     procedure Assign(Source: TPlayers);
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
-    function GetAlivePlayers: TPlayerArray;
+    function GetAliveCount: Integer;
+    procedure GetAlivePlayers(Players: TPlayers); overload;
+    function GetAlivePlayers: TPlayerArray; overload;
     function GetAlivePlayersWithCities: TPlayerArray;
   end;
@@ -1089 +1090 @@
 end;
 
+procedure TPlayers.GetAlivePlayers(Players: TPlayers);
+var
+  Player: TPlayer;
+begin
+  Players.Clear;
+  for Player in Self do
+    if Player.IsAlive then Players.Add(Player);
+end;
+
 function TPlayers.FindById(Id: Integer): TPlayer;
 var
@@ -1148 +1158 @@
 end;
 
-constructor TPlayers.Create;
-begin
-  inherited Create;
+constructor TPlayers.Create(FreeObjects: Boolean = True);
+begin
+  inherited;
   NewPlayerId := 1;
 end;
@@ -3155 +3165 @@
 procedure TGame.NextPlayer;
 var
-  PrevPlayer: TPlayer;
+  AlivePlayers: TPlayers;
+  NewPlayerIndex: Integer;
 begin
   // Finalize current player
@@ -3163 +3174 @@
   ComputePlayerStats;
 
-  // Select new player
-  PrevPlayer := CurrentPlayer;
-  // Skip dead players
-  repeat
-    CurrentPlayer := Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count];
-  until CurrentPlayer.IsAlive;
-  if Assigned(FOnPlayerChange) then
-    FOnPlayerChange(Self);
-
-  if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then begin
+  // Select new player from alive players
+  AlivePlayers := TPlayers.Create(False);
+  Players.GetAlivePlayers(AlivePlayers);
+  NewPlayerIndex := AlivePlayers.IndexOf(CurrentPlayer) + 1;
+  if NewPlayerIndex >= AlivePlayers.Count then begin
+    // Start of turn
     Inc(TurnCounter);
     RecordTurnStats;
     if Assigned(FOnNewTurn) then
       FOnNewTurn(Self);
-  end;
+    NewPlayerIndex := NewPlayerIndex mod AlivePlayers.Count;
+  end;
+  CurrentPlayer := AlivePlayers[NewPlayerIndex];
+
+  if Assigned(FOnPlayerChange) then
+    FOnPlayerChange(Self);
   CheckWinObjective;
   CurrentPlayer.PlayerMap.CheckVisibility;