Changeset 185 for trunk/UCore.pas

Timestamp:

Feb 12, 2018, 3:08:27 PM (7 years ago)

Author:

chronos

Message:

• Added: Package CoolStreaming.
• Added: GameProtocol unit for implementation of client/server game protocol methods.

File:

• trunk/UCore.pas (modified) (9 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,
-  UGameServer, UGameClient;
+  URegistry, ULastOpenedList, Registry, Menus, UGeometry, UFormClient,
+  UGameServer, UGameClient, fgl;
 
 type
@@ -87 +87 @@
     AnimationSpeed: Integer;
     AutoSaveEnabled: Boolean;
-    FormClients: TObjectList; // TFormClient
-    //CurrentClient: TClient;
-    LocalClients: TObjectList; // TClient
+    FormClients: TFPGObjectList<TFormClient>;
+    Clients: TClients;
     procedure Spectate(Player: TPlayer);
     procedure UpdateActions;
@@ -219 +218 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := Server.Clients.SearchPlayer(FirstHuman)
-    else FormClient.Client := TClient(Server.Clients.First);
+  if Assigned(FirstHuman) then FormClient.Client := Clients.SearchPlayer(FirstHuman)
+    else FormClient.Client := TClient(Clients.First);
 end;
 
@@ -376 +375 @@
 begin
   Server := TServer.Create;
+  Clients := TClients.Create;
   Game := TGame.Create;
   Game.OnMoveUpdated := DoMoveUpdated;
@@ -382 +382 @@
   Game.OnPlayerChange := DoPlayerChange;
   Server.Game := Game;
+  Clients.Game := Game;
   StoredDimension := TControlDimension.Create;
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
   ForceDirectories(GetAppConfigDir(False));
-  FormClients := TObjectList.Create;
+  FormClients := TFPGObjectList<TFormClient>.Create;
 end;
 
@@ -400 +401 @@
   FreeAndNil(Server);
   FreeAndNil(Game);
+  FreeAndNil(Clients);
 end;
 
@@ -447 +449 @@
 begin
   Form := TFormClient.Create(nil);
-  Form.Client := Server.Clients.New(SSpectator);
+  Form.Client := Clients.New(SSpectator);
   //Form.Client.Form := Form;
   //Form.Client.ControlPlayer := Player;
@@ -456 +458 @@
 
 procedure TCore.StartNewGame;
+var
+  NewClient: TClient;
+  Player: TPlayer;
 begin
   Game.New;
   Server.InitClients;
+
+  // Create local clients for human players
+  for Player in Game.Players do
+  with Player do
+  if Mode = pmHuman then begin
+    NewClient := Clients.New(Name);
+    NewClient.ControlPlayer := Player;
+    NewClient.View.Clear;
+    NewClient.View.Zoom := 1;
+    if Assigned(NewClient.ControlPlayer.StartCell) then
+      NewClient.View.CenterPlayerCity(NewClient.ControlPlayer)
+      else NewClient.View.CenterMap;
+  end;
+
   Game.DevelMode := DevelMode;
   SelectClient;
@@ -474 +493 @@
 begin
   if Assigned(Game.CurrentPlayer) then begin
-    PlayerClient := Server.Clients.SearchPlayer(Game.CurrentPlayer);
+    PlayerClient := Clients.SearchPlayer(Game.CurrentPlayer);
     if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
   end;