Changeset 125 for trunk/UCore.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/UCore.pas (modified) (12 diffs)

trunk/UCore.pas

@@ -52 +52 @@
     StoredDimension: TControlDimension;
     RegistryContext: TRegistryContext;
+    procedure DoPlayerChange(Sender: TObject);
     procedure DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
@@ -58 +59 @@
     procedure GameNewTurnExecute(Sender: TObject);
     procedure AutoSave;
+    function GetPlayer: TPlayer;
     procedure LoadConfig;
     procedure SaveConfig;
     procedure CommandLineParams;
     procedure ScaleDPI;
+    procedure SelectClient;
   public
     Game: TGame;
-    Player: TPlayer;
     UseSingleView: Boolean;
     DevelMode: Boolean;
@@ -70 +72 @@
     AnimationSpeed: Integer;
     AutoSaveEnabled: Boolean;
+    CurrentClient: TClient;
     procedure UpdateActions;
     procedure Init;
@@ -160 +163 @@
 end;
 
+function TCore.GetPlayer: TPlayer;
+begin
+  Result := Game.CurrentPlayer;
+end;
+
 procedure TCore.LoadConfig;
 begin
@@ -196 +204 @@
     if FileExists(FileName) then begin
       Game.LoadFromFile(FileName);
-      Player := Game.Players.GetFirstHuman;
+      SelectClient;
       LastMapFileName := OpenDialog1.FileName;
-      with Core.Game.CurrentPlayer do
+      with Core.CurrentClient do
         View.DestRect := Bounds(0, 0, FormMain.PaintBox1.Width, FormMain.PaintBox1.Height);
       FormMain.AZoomAll.Execute;
@@ -226 +234 @@
   end;
   {$endif}
+end;
+
+procedure TCore.SelectClient;
+var
+  FirstHuman: TPlayer;
+begin
+  FirstHuman := Game.Players.GetFirstHuman;
+  if Assigned(FirstHuman) then CurrentClient := FirstHuman.Client
+    else CurrentClient := TClient(Game.Clients.First);
 end;
 
@@ -289 +306 @@
   if OpenDialog1.Execute then begin
     Game.LoadFromFile(OpenDialog1.FileName);
-    Player := Game.Players.GetFirstHuman;
+    SelectClient;
     LastMapFileName := OpenDialog1.FileName;
-    with Core.Game.CurrentPlayer do
+    with Core.CurrentClient do
       View.DestRect := Bounds(0, 0, FormMain.PaintBox1.Width, FormMain.PaintBox1.Height);
     FormMain.AZoomAll.Execute;
@@ -304 +321 @@
     FormNew.Save(Game);
     Game.New;
-    Player := Game.Players.GetFirstHuman;
+    SelectClient;
     Game.Running := True;
     FormMain.AZoomAll.Execute;
@@ -365 +382 @@
   Game.OnWin := DoOnWin;
   Game.OnNewTurn := GameNewTurnExecute;
+  Game.OnPlayerChange := DoPlayerChange;
   StoredDimension := TControlDimension.Create;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
@@ -376 +394 @@
   SaveConfig;
   FreeAndNil(Game);
+end;
+
+procedure TCore.DoPlayerChange(Sender: TObject);
+begin
+  if Assigned(Game.CurrentPlayer) and Assigned(Game.CurrentPlayer.Client) then
+    CurrentClient := Game.CurrentPlayer.Client;
 end;
 
@@ -389 +413 @@
   FInitialized := True;
   LoadConfig;
-  for I := 0 to Game.Players.Count - 1 do
-    TPlayer(Game.Players[I]).View.DestRect := Rect(0, 0, FormMain.PaintBox1.Width,
+  for I := 0 to Game.Clients.Count - 1 do
+    TClient(Game.Clients[I]).View.DestRect := Rect(0, 0, FormMain.PaintBox1.Width,
       FormMain.PaintBox1.Height);
   Game.LoadConfig(XMLConfig1, 'Game');
@@ -399 +423 @@
   if Game.FileName = '' then begin
     Game.New;
-    Player := Game.Players.GetFirstHuman;
+    SelectClient;
     Game.Running := True;
     FormMain.AZoomAll.Execute;