Changeset 231 for trunk/UCore.pas

Timestamp:

Sep 19, 2018, 2:05:52 PM (6 years ago)

Author:

chronos

Message:

• Modified: UGame unit was split to UPlayer, UMap and UClientGUI units to have better logical separation of game classes.
• Modified: Drawing methods moved from TMap and TPlayerMap to TClientGUI. Generic TClient class and TComputer classes don't need have any drawing support.

File:

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

trunk/UCore.pas

@@ -8 +8 @@
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
-  URegistry, ULastOpenedList, Registry, Menus, UFormClient,
+  URegistry, ULastOpenedList, Registry, Menus, UFormClient, UPlayer,
   UGameServer, UGameClient, fgl, UServerList;
 
@@ -115 +115 @@
 uses
   UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI, UFormKeyShortcuts,
-  UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
+  UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats, UClientGUI;
 
 const
@@ -248 +248 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then FormClient.Client := LocalClients.SearchPlayer(FirstHuman)
-    else FormClient.Client := TClient(LocalClients.First);
+  if Assigned(FirstHuman) then FormClient.Client := TClientGUI(LocalClients.SearchPlayer(FirstHuman))
+    else begin
+      FormClient.Client := TClientGUI(LocalClients.New(SSpectator));
+      FormClient.Client.LocalServer := Server;
+      FormClient.Client.ConnectType := ctLocal;
+      FormClient.Client.Active := True;
+      FormClient.AZoomAll.Execute;
+    end;
 end;
 
@@ -469 +475 @@
     NewClient := LocalClients.New(Name);
     NewClient.ControlPlayer := Player;
-    NewClient.View.Clear;
-    NewClient.View.Zoom := 1;
+    TClientGUI(NewClient).View.Clear;
+    TClientGUI(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;
+      TClientGUI(NewClient).View.CenterPlayerCity(NewClient.ControlPlayer)
+      else TClientGUI(NewClient).View.CenterMap;
   end else
   if Mode = pmComputer then begin
     NewClient := TComputer.Create;
-    NewClient.Game := Game;
+    NewClient.Game := TGame(Game);
     NewClient.Name := Name;
     LocalClients.Add(NewClient);
@@ -537 +543 @@
 begin
   Form := TFormClient.Create(nil);
-  Form.Client := LocalClients.New(SSpectator);
+  Form.Client := TClientGUI(LocalClients.New(SSpectator));
   Form.Client.LocalServer := Server;
   Form.Client.ConnectType := ctLocal;
@@ -566 +572 @@
     NewClient := LocalClients.New(Name);
     NewClient.ControlPlayer := Player;
-    NewClient.View.Clear;
-    NewClient.View.Zoom := 1;
+    TClientGUI(NewClient).View.Clear;
+    TClientGUI(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;
+      TClientGUI(NewClient).View.CenterPlayerCity(NewClient.ControlPlayer)
+      else TClientGUI(NewClient).View.CenterMap;
   end else
   if Mode = pmComputer then begin
     NewClient := TComputer.Create;
-    NewClient.Game := Game;
+    NewClient.Game := TGame(Game);
     NewClient.Name := Name;
     LocalClients.Add(NewClient);
@@ -607 +613 @@
     if Game.CurrentPlayer.Mode = pmHuman then begin
       PlayerClient := LocalClients.SearchPlayer(Game.CurrentPlayer);
-      if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
+      if Assigned(PlayerClient) then FormClient.Client := TClientGUI(PlayerClient);
     end;