Changeset 28 for trunk/UGame.pas

Timestamp:

Mar 3, 2014, 8:53:04 PM (10 years ago)

Author:

chronos

Message:

• Fixed: Use modified player list from New game. Allow more players then two with different colors.
• Added: Toolbar for quick access to common actions.

File:

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

trunk/UGame.pas

@@ -12 +12 @@
   CellMulX = 1.12;
   CellMulY = 1.292;
+  MaxPlayerCount = 8;
 
 type
@@ -64 +65 @@
     function CanvasToCellRect(Pos: TRect): TRect;
     function CellToCanvasRect(Pos: TRect): TRect;
+    procedure Assign(Source: TView);
     property DestRect: TRect read FDestRect write SetDestRect;
     property Zoom: Double read FZoom write SetZoom;
@@ -164 +166 @@
 const
   PlayerModeText: array[TPlayerMode] of string = ('Human', 'Computer');
+  clOrange = $009Aff;
+  PlayerColors: array[0..7] of TColor = (clBlue, clRed, clGreen, clOrange, clPurple, clMaroon, clAqua, clFuchsia);
 
 
@@ -310 +314 @@
   Result.TopLeft := CellToCanvasPos(Pos.TopLeft);
   Result.BottomRight := CellToCanvasPos(Pos.BottomRight);
+end;
+
+procedure TView.Assign(Source: TView);
+begin
+  SourceRect := Source.SourceRect;
+  DestRect := Source.DestRect;
+  Zoom := Source.Zoom;
 end;
 
@@ -398 +409 @@
   StartUnits := Source.StartUnits;
   SelectedCell := Source.SelectedCell;
-  View.Zoom := Source.View.Zoom;
+  FocusedCell := Source.FocusedCell;
+  View.Assign(Source.View);
 end;
 
@@ -481 +493 @@
 
 procedure TGame.SetRunning(AValue: Boolean);
+var
+  I: Integer;
 begin
   if FRunning = AValue then Exit;
@@ -486 +500 @@
     if Players.Count < 2 then raise Exception.Create(SMinimumPlayers);
     FRunning := AValue;
-  end else FRunning := AValue;
+  end else begin
+    FRunning := AValue;
+    for I := 0 to Players.Count - 1 do
+    with TPlayer(Players[I]) do begin
+      SelectedCell := nil;
+      FocusedCell := nil;
+    end;
+  end;
 end;
 
@@ -739 +760 @@
     end else begin
       Pen.Color := clBlack;
-      Pen.Style := psClear;
+      // Cannot set clear border as it will display shifted on gtk2
+      //Pen.Style := psClear;
+      Pen.Color := Brush.Color;
+      Pen.Style := psSolid;
     end;
     Points := GetHexagonPolygon(Point(Trunc(Pos.X), Trunc(Pos.Y)), Point(Trunc(HexSize.X), Trunc(HexSize.Y)));
-    Polygon(Points);
+    Polygon(Points, False, 0, Length(Points));
+    //Rectangle(Trunc(Pos.X), Trunc(Pos.Y), Trunc(Pos.X + HexSize.X), Trunc(Pos.Y + HexSize.Y));
     Pen.Style := psSolid;
     Font.Color := clWhite;