Changeset 202 for trunk/UCore.pas

Timestamp:

May 17, 2018, 5:41:47 PM (6 years ago)

Author:

chronos

Message:

• Modified: AI player related code moved to UClientAI unit. It is now extension of TClient class to simulate regular human client.
• Modified: More work on client-server architecture.

File:

• trunk/UCore.pas (modified) (14 diffs)

trunk/UCore.pas

@@ -9 +9 @@
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
   URegistry, ULastOpenedList, Registry, Menus, UGeometry, UFormClient,
-  UGameServer, UGameClient, fgl, UServerList;
+  UGameServer, UGameClient, fgl, UServerList, UGameProtocol;
 
 type
@@ -65 +65 @@
     GameLoaded: Boolean;
     procedure LoadRecentExecute(Sender: TObject);
-    procedure ProcessComputerTurns;
     procedure StartNewGame;
     procedure DoPlayerChange(Sender: TObject);
@@ -91 +90 @@
     ReopenLastFile: Boolean;
     FormClients: TFPGObjectList<TFormClient>;
-    Clients: TClients;
+    LocalClients: TClients;
     ServerList: TServerList;
     procedure Spectate(Player: TPlayer);
@@ -109 +108 @@
 
 uses
-  UFormMain, UFormNew, UFormSettings, UFormAbout,
+  UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -240 +239 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := Clients.SearchPlayer(FirstHuman)
-    else FormClient.Client := TClient(Clients.First);
+  if Assigned(FirstHuman) then FormClient.Client := LocalClients.SearchPlayer(FirstHuman)
+    else FormClient.Client := TClient(LocalClients.First);
 end;
 
@@ -275 +274 @@
 end;
 
-procedure TCore.ProcessComputerTurns;
-begin
-  while Game.Running and (Game.CurrentPlayer.Mode <> pmHuman) do begin
-    if Game.CurrentPlayer.Mode = pmComputer then begin
-      Game.CurrentPlayer.Computer.Process;
-      RedrawClients;
-      Delay(Trunc((100 - AnimationSpeed) / 100 * 2000));
-    end;
-    Game.NextTurn;
-    RedrawClients;
-    Application.ProcessMessages;
-    Sleep(1);
-  end;
-end;
-
 procedure TCore.AGameEndTurnExecute(Sender: TObject);
 begin
-  Game.NextTurn;
+  Game.NextPlayer;
   RedrawClients;
-  ProcessComputerTurns;
   UpdateActions;
 end;
@@ -399 +382 @@
 begin
   Server := TServer.Create;
-  Clients := TClients.Create;
+  LocalClients := TClients.Create;
   GameSettings := TGame.Create;
   Game := TGame.Create;
@@ -407 +390 @@
   Game.OnPlayerChange := DoPlayerChange;
   Server.Game := Game;
-  Clients.Game := Game;
+  LocalClients.Game := Game;
   StoredDimension := TControlDimension.Create;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
@@ -424 +407 @@
   FreeAndNil(StoredDimension);
   FreeAndNil(Server);
-  FreeAndNil(Clients);
+  FreeAndNil(LocalClients);
   FreeAndNil(Game);
   FreeAndNil(GameSettings);
@@ -448 +431 @@
   Game.LoadFromFile(FileName);
   Server.InitClients;
-
-  // Create local clients for human players
+  Server.Active := True;
+
+  // Create local LocalClients for human players
   for Player in Game.Players do
   with Player do
   if Mode = pmHuman then begin
-    NewClient := Clients.New(Name);
+    NewClient := LocalClients.New(Name);
     NewClient.ControlPlayer := Player;
     NewClient.View.Clear;
     NewClient.View.Zoom := 1;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
     if Assigned(NewClient.ControlPlayer.StartCell) then
       NewClient.View.CenterPlayerCity(NewClient.ControlPlayer)
       else NewClient.View.CenterMap;
+  end else
+  if Mode = pmComputer then begin
+    NewClient := TComputer.Create;
+    NewClient.Game := Game;
+    NewClient.Name := Name;
+    LocalClients.Add(NewClient);
+    NewClient.ControlPlayer := Player;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
   end;
 
@@ -493 +490 @@
 begin
   Form := TFormClient.Create(nil);
-  Form.Client := Clients.New(SSpectator);
+  Form.Client := LocalClients.New(SSpectator);
   //Form.Client.Form := Form;
   //Form.Client.ControlPlayer := Player;
@@ -505 +502 @@
   NewClient: TClient;
   Player: TPlayer;
+  ServerClient: TServerClient;
 begin
   Game.New;
   Server.InitClients;
-
-  // Create local clients for human players
+  Server.Active := True;
+
+  // Create local LocalClients for human players
   for Player in Game.Players do
   with Player do
   if Mode = pmHuman then begin
-    NewClient := Clients.New(Name);
+    NewClient := LocalClients.New(Name);
     NewClient.ControlPlayer := Player;
     NewClient.View.Clear;
     NewClient.View.Zoom := 1;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
     if Assigned(NewClient.ControlPlayer.StartCell) then
       NewClient.View.CenterPlayerCity(NewClient.ControlPlayer)
       else NewClient.View.CenterMap;
+  end else
+  if Mode = pmComputer then begin
+    NewClient := TComputer.Create;
+    NewClient.Game := Game;
+    NewClient.Name := Name;
+    LocalClients.Add(NewClient);
+    NewClient.ControlPlayer := Player;
+    NewClient.LocalServer := Server;
+    NewClient.ConnectType := ctLocal;
+    NewClient.Active := True;
   end;
 
@@ -528 +540 @@
   RedrawClients;
   UpdateOtherForms;
-  ProcessComputerTurns;
   UpdateActions;
+  ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
+  if Assigned(ServerClient) then ServerClient.TurnStart
+    else raise Exception.Create('Server client for current player not found.');
 end;
 
@@ -535 +549 @@
 var
   PlayerClient: TClient;
+  ServerClient: TServerClient;
 begin
   if Assigned(Game.CurrentPlayer) then begin
-    PlayerClient := Clients.SearchPlayer(Game.CurrentPlayer);
+    PlayerClient := LocalClients.SearchPlayer(Game.CurrentPlayer);
     if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
+
+    ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
+    if Assigned(ServerClient) then ServerClient.TurnStart;
   end;
   UpdateOtherForms;