Changeset 125 for trunk/UGame.pas

Timestamp:

Jun 17, 2017, 2:24:51 AM (7 years ago)

Author:

chronos

Message:

• Modified: Introduced TClient class for real user accessing particular player or spectator. TPlayer is now just player in the game.
• Fixed: Exception if no human player was selected.

File:

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

trunk/UGame.pas

@@ -28 +28 @@
   TCellLinks = class;
   TMapArea = class;
+  TClient = class;
 
   TFloatPoint = record
@@ -248 +249 @@
   TPlayer = class
   private
+    FClient: TClient;
     FGame: TGame;
+    procedure SetClient(AValue: TClient);
     procedure SetGame(AValue: TGame);
   public
@@ -254 +257 @@
     Name: string;
     Color: TColor;
-    View: TView;
     Mode: TPlayerMode;
     TotalUnits: Integer;
@@ -266 +268 @@
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
-    procedure Paint(Canvas: TCanvas);
+    procedure Paint(Canvas: TCanvas; View: TView);
     constructor Create;
     destructor Destroy; override;
     procedure Assign(Source: TPlayer);
     property Game: TGame read FGame write SetGame;
+    property Client: TClient read FClient write SetClient;
   end;
 
@@ -333 +336 @@
   end;
 
+  { TClient }
+
+  TClient = class
+  private
+    FGame: TGame;
+    FControlPlayer: TPlayer;
+    procedure SetControlPlayer(AValue: TPlayer);
+    procedure SetGame(AValue: TGame);
+  public
+    Name: string;
+    View: TView;
+    constructor Create;
+    destructor Destroy; override;
+    property ControlPlayer: TPlayer read FControlPlayer write SetControlPlayer;
+    property Game: TGame read FGame write SetGame;
+  end;
+
+  { TClients }
+
+  TClients = class(TObjectList)
+    Game: TGame;
+    procedure New(Name: string);
+  end;
+
   { TGame }
 
@@ -349 +376 @@
     FOnMove: TMoveEvent;
     FOnNewTurn: TNotifyEvent;
+    FOnPlayerChange: TNotifyEvent;
     FOnWin: TWinEvent;
     FRunning: Boolean;
@@ -367 +395 @@
   public
     Players: TPlayers;
+    Clients: TClients;
     Map: TMap;
     MapImageFileName: string;
@@ -406 +435 @@
     property OnWin: TWinEvent read FOnWin write FOnWin;
     property OnNewTurn: TNotifyEvent read FOnNewTurn write FOnNewTurn;
+    property OnPlayerChange: TNotifyEvent read FOnPlayerChange write FOnPlayerChange;
   end;
 
@@ -509 +539 @@
     ((((Color shr 16) and $ff) shr 1) shl 16) or
     ((((Color shr 24) and $ff) shr 0) shl 24);
+end;
+
+{ TClients }
+
+procedure TClients.New(Name: string);
+var
+  NewClient: TClient;
+begin
+  NewClient := TClient.Create;
+  NewClient.Game := Game;
+  NewClient.Name := Name;
+  Add(NewClient);
+end;
+
+{ TClient }
+
+procedure TClient.SetGame(AValue: TGame);
+begin
+  if FGame = AValue then Exit;
+  FGame := AValue;
+  View.Game := AValue;
+end;
+
+procedure TClient.SetControlPlayer(AValue: TPlayer);
+begin
+  if FControlPlayer = AValue then Exit;
+  if Assigned(FControlPlayer) then
+    FControlPlayer.FClient := nil;
+  FControlPlayer := AValue;
+  if Assigned(FControlPlayer) then
+     FControlPlayer.FClient := Self;
+end;
+
+constructor TClient.Create;
+begin
+  View := TView.Create;
+end;
+
+destructor TClient.Destroy;
+begin
+  ControlPlayer := nil;
+  FreeAndNil(View);
+  inherited Destroy;
 end;
 
@@ -1740 +1813 @@
   if FGame = AValue then Exit;
   FGame := AValue;
-  View.Game := Game;
+end;
+
+procedure TPlayer.SetClient(AValue: TClient);
+begin
+  if FClient=AValue then Exit;
+  if Assigned(FClient) then FClient.FControlPlayer := nil;
+  FClient := AValue;
+  if Assigned(FClient) then FClient.FControlPlayer := Self;
 end;
 
@@ -2146 +2226 @@
 end;
 
-procedure TPlayer.Paint(Canvas: TCanvas);
+procedure TPlayer.Paint(Canvas: TCanvas; View: TView);
 begin
   PlayerMap.Paint(Canvas, View);
@@ -2153 +2233 @@
 constructor TPlayer.Create;
 begin
-  View := TView.Create;
   StartUnits := DefaultPlayerStartUnits;
   StartCell := nil;
@@ -2163 +2242 @@
 begin
   FreeAndNil(PlayerMap);
-  FreeAndNil(View);
   inherited Destroy;
 end;
@@ -2180 +2258 @@
   Agressivity := Source.Agressivity;
   Defensive := Source.Defensive;
-  View.Assign(Source.View);
 end;
 
@@ -2432 +2509 @@
   end else begin
     FRunning := AValue;
-    for I := 0 to Players.Count - 1 do
-    with TPlayer(Players[I]) do begin
+    for I := 0 to Clients.Count - 1 do
+    with TClient(Clients[I]) do begin
       View.Clear;
     end;
@@ -2811 +2888 @@
   PrevPlayer: TPlayer;
 begin
-  CurrentPlayer.View.SelectedCell := nil;
+  //TODO CurrentPlayer.View.SelectedCell := nil;
   MoveAll(CurrentPlayer);
   Map.Grow(CurrentPlayer);
@@ -2820 +2897 @@
   repeat
     CurrentPlayer := TPlayer(Players[(Players.IndexOf(CurrentPlayer) + 1) mod Players.Count]);
+    if Assigned(FOnPlayerChange) then
+      FOnPlayerChange(Self);
   until CurrentPlayer.TotalCells > 0;
   if Players.IndexOf(CurrentPlayer) < Players.IndexOf(PrevPlayer) then begin
@@ -2870 +2949 @@
   Players := TPlayers.Create;
   Players.Game := Self;
+  Clients := TClients.Create;
+  Clients.Game := Self;
 
   MapImageFileName := 'Images/Maps/WorldMap.png';
@@ -2887 +2968 @@
 destructor TGame.Destroy;
 begin
+  FreeAndNil(Clients);
   FreeAndNil(Moves);
   FreeAndNil(Players);
@@ -2918 +3000 @@
   end;
 
-
   if SymetricMap then begin
     for C := 0 to (Map.Cells.Count div 2) - 1 do begin
@@ -2931 +3012 @@
   with TPlayer(Players[I]) do begin
     PlayerMap.Update;
-    View.Clear;
     if (Map.Size.X > 0) and (Map.Size.Y > 0) then begin
       // Try to obtain start cell for each player
@@ -2950 +3030 @@
       StartCell.Power := TPlayer(Players[I]).StartUnits;
     end;
+    PlayerMap.CheckVisibility;
+  end;
+  if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
+    else CurrentPlayer := nil;
+
+  Clients.Clear;
+  Clients.New('Spectator');
+  for I := 0 to Players.Count - 1 do
+  with TPlayer(Players[I]) do
+  if Mode = pmHuman then begin
+    Clients.New(TPlayer(Players[I]).Name);
+    TPlayer(Players[I]).Client := TClient(Clients.Last);
+  end;
+
+  for I := 0 to Clients.Count - 1 do
+  with TClient(Clients[I]) do begin
+    View.Clear;
     View.Zoom := 1;
     View.CenterMap;
-    PlayerMap.CheckVisibility;
-  end;
-  if Players.Count > 0 then CurrentPlayer := TPlayer(Players[0])
-    else CurrentPlayer := nil;
+  end;
 end;
 
@@ -2985 +3079 @@
     with TCellLink(CellLinks[C]) do begin
       if Length(Points) >= 2 then begin
-        MoveTo(Points[0]);
+        MoveTo(View.CellToCanvasPos(Points[0]));
         for I := 1 to Length(Points) - 1 do
-          LineTo(Points[I]);
+          LineTo(View.CellToCanvasPos(Points[I]));
       end;
     end;