Changeset 158

Timestamp:

Nov 19, 2017, 1:02:02 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Show error message if not all players were placed to the map.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (1 diff)
• Languages/xtactics.po (modified) (1 diff)
• UCore.pas (modified) (2 diffs)
• UGame.pas (modified) (28 diffs)
• UMap.pas (modified) (4 diffs)

trunk/Forms/UFormMain.pas

@@ -251 +251 @@
 begin
   with Core, Game, CurrentClient, View do begin
-    MapRect := Map.GetPixelRect;
+    MapRect := Map.CalculatePixelRect;
     Factor := FloatPoint((DestRect.Right - DestRect.Left) / (MapRect.Right - MapRect.Left),
       (DestRect.Bottom - DestRect.Top) / (MapRect.Bottom - MapRect.Top));

trunk/Languages/xtactics.cs.po

@@ -503 +503 @@
 msgid "Do you want to end current game?"
 msgstr "Chcete ukončit aktuální hru?"
+
+#: ucore.splayersnotinitialized
+msgid "Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells."
+msgstr "Ne všichni hráči byli vytvoření. Potřeba %d, vytvořeno %d. Změňte parametry mapy abyste měli více políček země."
 
 #: ucore.splayerwins

trunk/Languages/xtactics.po

@@ -487 +487 @@
 #: ucore.sendgamequestion
 msgid "Do you want to end current game?"
+msgstr ""
+
+#: ucore.splayersnotinitialized
+msgid "Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells."
 msgstr ""
 

trunk/UCore.pas

@@ -109 +109 @@
   SRestartGame = 'Restart game?';
   SRestartGameQuestion = 'Do you want to restart current game?';
+  SPlayersNotInitialized = 'Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells.';
 
 
@@ -429 +430 @@
   Game.New;
   SelectClient;
-  Game.Running := True;
+  if Game.Players.GetAliveCount = Game.Players.Count then Game.Running := True
+    else ShowMessage(Format(SPlayersNotInitialized, [Game.Players.Count, Game.Players.GetAliveCount]));
   FormMain.Redraw;
   if FormCharts.Visible then FormCharts.Redraw;

trunk/UGame.pas

@@ -98 +98 @@
 
   TCellLink = class
-    Allocated: Boolean;
     Points: array of TPoint;
     Cells: TCells;
@@ -184 +183 @@
     procedure SetSize(AValue: TPoint); virtual;
   protected
+    FPixelRect: TRect;
     FNewCellId: Integer;
     function GetNewCellId: Integer; virtual;
@@ -216 +216 @@
     destructor Destroy; override;
     procedure Paint(Canvas: TCanvas; View: TView); virtual;
-    function GetPixelRect: TRect; virtual;
+    function CalculatePixelRect: TRect; virtual;
     procedure ForEachCells(Method: TMethod); virtual;
     property Size: TPoint read GetSize write SetSize;
+    property PixelRect: TRect read FPixelRect;
   end;
 
@@ -315 +316 @@
     Moves: TUnitMoves;
     Computer: TComputer;
+    function IsAlive: Boolean;
     procedure Clear;
     procedure LoadFromNode(Node: TDOMNode);
@@ -350 +352 @@
 
   TPlayers = class(TFPGObjectList<TPlayer>)
+  public
     Game: TGame;
     NewPlayerId: Integer;
+    function GetAliveCount: Integer;
     function FindById(Id: Integer): TPlayer;
     procedure New(Name: string; Color: TColor; Mode: TPlayerMode);
@@ -362 +366 @@
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
+    function GetAlivePlayers: TPlayerArray;
+    function GetAlivePlayersWithCities: TPlayerArray;
   end;
 
@@ -478 +484 @@
     procedure SaveToFile(FileName: string);
     procedure ComputePlayerStats;
-    function GetAlivePlayers: TPlayerArray;
-    function GetAlivePlayersWithCities: TPlayerArray;
     procedure NextTurn;
     procedure CheckWinObjective;
@@ -732 +736 @@
 constructor TCellLink.Create;
 begin
-  Allocated := True;
   Cells := TCells.Create;
   Cells.FreeObjects := False;
@@ -739 +742 @@
 destructor TCellLink.Destroy;
 var
-  Links: TCellLinks;
-  FirstLink: TCellLink;
   I: Integer;
 begin
@@ -746 +747 @@
     if TCell(Cells[I]).Neighbors.Remove(TCell(Cells[1 - I])) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
-    Links := TCell(Cells[I]).Links;
-    if Links.Count > 0 then
-    FirstLink := TCellLink(Links[0]);
     if TCell(Cells[I]).Links.Remove(Self) = -1 then
       raise Exception.Create(SCellRemoveNeighborError);
   end;
   FreeAndNil(Cells);
-  Allocated := False;
   inherited Destroy;
 end;
@@ -1159 +1156 @@
 { TPlayers }
 
+function TPlayers.GetAliveCount: Integer;
+var
+  Player: TPlayer;
+begin
+  Result := 0;
+  for Player in Self do
+    if Player.IsAlive then Inc(Result);
+end;
+
 function TPlayers.FindById(Id: Integer): TPlayer;
 var
@@ -1354 +1360 @@
     msRectangle: Result := False;
     msImage: begin
-      Rect := GetPixelRect;
+      Rect := PixelRect;
       with Image.Picture.Bitmap do begin
         Pos := Point(Trunc(Coord.X / (Rect.Right - Rect.Left) * Width),
@@ -1363 +1369 @@
     end;
     msRounded: begin
-      Rect := GetPixelRect;
+      Rect := PixelRect;
       Center := Point(Rect.Left + (Rect.Right - Rect.Left) div 2,
         Rect.Top + (Rect.Bottom - Rect.Top) div 2);
@@ -1594 +1600 @@
 procedure TMap.ComputePlayerStats;
 var
-  I: Integer;
-begin
-  for I := 0 to Cells.Count - 1 do
-  with TCell(Cells[I]) do begin
+  Cell: TCell;
+begin
+  for Cell in Cells do
+  with Cell do begin
     if Assigned(Player) then begin
       Player.TotalCells := Player.TotalCells + 1;
@@ -1621 +1627 @@
     NewCell := TCell.Create;
     NewCell.Map := Self;
-    NewCell.PosPx := Point(X, Y);
+    NewCell.PosPx := Point(X * DefaultCellSize.X, Y * DefaultCellSize.Y);
     NewCell.Id := GetNewCellId;
+    SetLength(NewCell.Polygon, 1);
+    NewCell.Polygon[0] := NewCell.PosPx;
     Cells[Y * FSize.X + X] := NewCell;
   end;
+  FPixelRect := CalculatePixelRect;
 end;
 
@@ -1729 +1738 @@
 end;
 
-function TMap.GetPixelRect: TRect;
+function TMap.CalculatePixelRect: TRect;
 var
   I: Integer;
@@ -2539 +2548 @@
   MapRect: TRect;
 begin
-  MapRect := Game.Map.GetPixelRect;
+  MapRect := Game.Map.PixelRect;
   SourceRect := Bounds(MapRect.Left + (MapRect.Right - MapRect.Left) div 2 - (SourceRect.Right - SourceRect.Left) div 2,
     MapRect.Top + (MapRect.Bottom - MapRect.Top) div 2 - (SourceRect.Bottom - SourceRect.Top) div 2,
@@ -2912 +2921 @@
 end;
 
+function TPlayer.IsAlive: Boolean;
+begin
+  Result := (TotalCells > 0) and Assigned(StartCell);
+end;
+
 procedure TPlayer.CheckCounterMove(Move: TUnitMove);
 var
@@ -3014 +3028 @@
   with TMapArea(Areas[I]) do begin
     GetBorderCells(BorderList);
-    for J := 0 to 1 do begin
+    for J := 0 to 4 do begin
 
     Cell := TCell(BorderList[Random(BorderList.Count)]);
@@ -3086 +3100 @@
     View.Clear;
     View.Zoom := 1;
-    if Assigned(ControlPlayer) then View.CenterPlayerCity(ControlPlayer)
+    if Assigned(ControlPlayer) and Assigned(ControlPlayer.StartCell) then
+      View.CenterPlayerCity(ControlPlayer)
       else View.CenterMap;
   end;
@@ -3096 +3111 @@
   Cell: TCell;
   List: TCells;
+  I: Integer;
 begin
   with Player do begin
@@ -3112 +3128 @@
       List.FreeObjects := False;
       Map.Cells.GetCellsWithWeight(List, Round(LongestDistance * 0.6), Round(LongestDistance * 0.8));
-      StartCell := List[Random(List.Count)];
+
+      // Remove cells already allocated to different player
+      for I := List.Count - 1 downto 0 do
+        if Assigned(TCell(List[I]).Player) then
+          List.Delete(I);
+
+      if List.Count > 0 then
+        StartCell := List[Random(List.Count)];
     finally
       FreeAndNil(List);
@@ -3353 +3376 @@
 end;
 
-function TGame.GetAlivePlayers: TPlayerArray;
-var
-  I: Integer;
+function TPlayers.GetAlivePlayers: TPlayerArray;
+var
+  Player: TPlayer;
 begin
   SetLength(Result, 0);
-  for I := 0 to Players.Count - 1 do
-    if TPlayer(Players[I]).TotalCells > 0 then begin
+  for Player in Self do
+    if Player.IsAlive then begin
       SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := TPlayer(Players[I]);
-    end;
-end;
-
-function TGame.GetAlivePlayersWithCities: TPlayerArray;
-var
-  I: Integer;
+      Result[Length(Result) - 1] := Player;
+    end;
+end;
+
+function TPlayers.GetAlivePlayersWithCities: TPlayerArray;
+var
+  Player: TPlayer;
 begin
   SetLength(Result, 0);
-  for I := 0 to Players.Count - 1 do
-    if TPlayer(Players[I]).TotalCities > 0 then begin
+  for Player in Self do
+    if Player.TotalCities > 0 then begin
       SetLength(Result, Length(Result) + 1);
-      Result[Length(Result) - 1] := TPlayer(Players[I]);
+      Result[Length(Result) - 1] := Player;
     end;
 end;
@@ -3392 +3415 @@
     if Assigned(FOnPlayerChange) then
       FOnPlayerChange(Self);
-  until CurrentPlayer.TotalCells > 0;
+  until CurrentPlayer.IsAlive;
   if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then begin
     Inc(TurnCounter);
@@ -3413 +3436 @@
   Winner := nil;
   if WinObjective = woDefeatAllOponents then begin
-    AlivePlayers := GetAlivePlayers;
+    AlivePlayers := Players.GetAlivePlayers;
     if (Length(AlivePlayers) <= 1) then begin
       if Length(AlivePlayers) > 0 then Winner := TPlayer(AlivePlayers[0]);
@@ -3420 +3443 @@
   end else
   if WinObjective = woDefeatAllOponentsCities then begin
-    AlivePlayers := GetAlivePlayersWithCities;
+    AlivePlayers := Players.GetAlivePlayersWithCities;
     if (Length(AlivePlayers) <= 1) then begin
       if Length(AlivePlayers) > 0 then Winner := TPlayer(AlivePlayers[0]);
@@ -3503 +3526 @@
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
       SelectPlayerStartCell(Player);
-      if SymetricMap and (I = 1) then
-        StartCell := TCell(Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)]);
-
-      StartCell.Terrain := ttCity;
-      StartCell.Player := Player;
-      StartCell.Power := Player.StartUnits;
+      if Assigned(Player.StartCell) then begin
+        if SymetricMap and (I = 1) then
+          StartCell := TCell(Map.Cells[Map.Cells.Count - 1 - Map.Cells.IndexOf(TPlayer(Players[0]).StartCell)]);
+
+        StartCell.Terrain := ttCity;
+        StartCell.Player := Player;
+        StartCell.Power := Player.StartUnits;
+      end;
     end;
     PlayerMap.CheckVisibility;
@@ -3517 +3542 @@
 
   InitClients;
+  ComputePlayerStats;
 end;
 

trunk/UMap.pas

@@ -173 +173 @@
     GetCellPosNeighbors(Point(X, Y), Neighbors);
   end;
+
+  FPixelRect := CalculatePixelRect;
 end;
 
@@ -211 +213 @@
       Neighbors.Add(TCell(Cells[(Y - 1) * Size.X + (X + 0)]));
   end;
+
+  FPixelRect := CalculatePixelRect;
 end;
 
@@ -256 +260 @@
     Cells[Y * Size.X + X] := NewCell;
   end;
+
+  FPixelRect := CalculatePixelRect;
 end;
 
@@ -317 +323 @@
       Neighbors.Add(TCell(Cells[(Y + 0) * Size.X + (X - 1)]));
   end;
+
+  FPixelRect := CalculatePixelRect;
 end;