Changeset 415

Timestamp:

Jan 10, 2025, 8:51:02 PM (4 hours ago)

Author:

chronos

Message:

• Fixed: Do not show player win dialog if there is only one player in the game.

Location:

trunk

Files:

• Game.pas (modified) (1 diff)
• View.pas (modified) (7 diffs)

trunk/Game.pas

@@ -872 +872 @@
 begin
   Winner := nil;
-  if WinObjective = woDefeatAllOponents then begin
+  if (WinObjective = woDefeatAllOponents) and (Players.Count > 1) then begin
     AlivePlayers := Players.GetAlivePlayers;
     if (Length(AlivePlayers) <= 1) then begin

trunk/View.pas

@@ -142 +142 @@
   R: TRect;
 begin
-  if TGame(Game).Map.Cyclic then begin
-    R := CellToCanvasRect(TGame(Game).Map.PixelRect);
+  if Game.Map.Cyclic then begin
+    R := CellToCanvasRect(Game.Map.PixelRect);
     CellPos := TPoint.Create(
       ModNeg(Pos.X - R.P1.X, R.Size.X) + R.P1.X,
@@ -156 +156 @@
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and (NewSelectedCell <> SelectedCell) and
-    TGame(Game).CurrentPlayer.IsAllowedMoveTarget(SelectedCell, NewSelectedCell) then begin
+    Game.CurrentPlayer.IsAllowedMoveTarget(SelectedCell, NewSelectedCell) then begin
       if ssShift in ShiftState then begin
         // Make maximum unit move without confirmation dialog
@@ -162 +162 @@
           Player.Moves.Remove(SelectedCell.MovesFrom[I]);
         end;
-        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
+        Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
         SelectedCell := nil;
       end else
@@ -170 +170 @@
         for I := SelectedCell.MovesFrom.Count - 1 downto 0 do
           Player.Moves.Remove(SelectedCell.MovesFrom[I]);
-        UnitMove := TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
+        UnitMove := Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power, False);
         if Assigned(UnitMove) then
           UnitMove.CountRepeat := TGame(Player.Game).Map.MaxPower;
@@ -176 +176 @@
           else SelectedCell := nil;
       end else begin
-        TGame(Game).CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power);
+        Game.CurrentPlayer.SetMove(SelectedCell, NewSelectedCell, SelectedCell.MapCell.OneUnit.Power);
         SelectedCell := nil;
       end;
@@ -193 +193 @@
   MapRect: TRect;
 begin
-  MapRect := TGame(Game).Map.PixelRect;
+  MapRect := Game.Map.PixelRect;
   SourceRect := TRect.CreateBounds(TPoint.Create(MapRect.P1.X + MapRect.Size.X div 2 - SourceRect.Size.X div 2,
     MapRect.P1.Y + MapRect.Size.Y div 2 - SourceRect.Size.Y div 2),
@@ -214 +214 @@
   NewZoom: Single;
 begin
-  MapRect := TGame(Game).Map.CalculatePixelRect;
+  MapRect := Game.Map.CalculatePixelRect;
   Factor := TPointF.Create(DestRect.Size.X / MapRect.Size.X,
     DestRect.Size.Y / MapRect.Size.Y);