Changeset 184 for trunk/UCore.pas

Timestamp:

Feb 12, 2018, 12:44:04 PM (7 years ago)

Author:

chronos

Message:

• Modified: Game server and client splitted to units separate from game classes.

File:

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

trunk/UCore.pas

@@ -8 +8 @@
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
-  URegistry, ULastOpenedList, Registry, Menus, UGeometry, Contnrs, UFormClient;
+  URegistry, ULastOpenedList, Registry, Menus, UGeometry, Contnrs, UFormClient,
+  UGameServer, UGameClient;
 
 type
@@ -104 +105 @@
 
 uses
-  UFormMove, UFormMain, UFormNew, UFormSettings, UFormAbout,
+  UFormMain, UFormNew, UFormSettings, UFormAbout,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -218 +219 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := FirstHuman.Client
+  if Assigned(FirstHuman) then FormClient.Client := Server.Clients.SearchPlayer(FirstHuman)
     else FormClient.Client := TClient(Server.Clients.First);
 end;
@@ -380 +381 @@
   Game.OnNewTurn := GameNewTurnExecute;
   Game.OnPlayerChange := DoPlayerChange;
-  Game.Server := Server;
   Server.Game := Game;
   StoredDimension := TControlDimension.Create;
@@ -447 +447 @@
 begin
   Form := TFormClient.Create(nil);
-  Form.Client := Game.Server.Clients.New(SSpectator);
+  Form.Client := Server.Clients.New(SSpectator);
   //Form.Client.Form := Form;
   //Form.Client.ControlPlayer := Player;
@@ -470 +470 @@
 
 procedure TCore.DoPlayerChange(Sender: TObject);
-begin
-  if Assigned(Game.CurrentPlayer) and Assigned(Game.CurrentPlayer.Client) then begin
-    FormClient.Client := Game.CurrentPlayer.Client;
+var
+  PlayerClient: TClient;
+begin
+  if Assigned(Game.CurrentPlayer) then begin
+    PlayerClient := Server.Clients.SearchPlayer(Game.CurrentPlayer);
+    if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
   end;
   UpdateOtherForms;