Changeset 180 for trunk/UCore.pas

Timestamp:

Feb 8, 2018, 5:32:31 PM (6 years ago)

Author:

chronos

Message:

• Modified: Client related interface moved from FormMain to FormClient. This code change will later allow to implement network client-server gameplay.
• Added: Allow to open other spectator client windows.

File:

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

trunk/UCore.pas

@@ -8 +8 @@
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
-  URegistry, ULastOpenedList, Registry, Menus, UGeometry;
+  URegistry, ULastOpenedList, Registry, Menus, UGeometry, Contnrs, UFormClient;
 
 type
@@ -16 +16 @@
   TCore = class(TDataModule)
     AAbout: TAction;
+    ANewSpectatorClient: TAction;
     AShowUnitMoves: TAction;
     AShowCharts: TAction;
@@ -47 +48 @@
     procedure AGameSaveExecute(Sender: TObject);
     procedure AHelpExecute(Sender: TObject);
+    procedure ANewSpectatorClientExecute(Sender: TObject);
     procedure ASettingsExecute(Sender: TObject);
     procedure AShowChartsExecute(Sender: TObject);
@@ -69 +71 @@
     procedure GameNewTurnExecute(Sender: TObject);
     procedure AutoSave;
-    function GetPlayer: TPlayer;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -76 +77 @@
     procedure SelectClient;
     procedure LoadGame(FileName: string);
+    procedure RedrawClients;
   public
     Game: TGame;
@@ -83 +85 @@
     AnimationSpeed: Integer;
     AutoSaveEnabled: Boolean;
-    CurrentClient: TClient;
+    FormClients: TObjectList; // TFormClient
+    //CurrentClient: TClient;
+    LocalClients: TObjectList; // TClient
     procedure UpdateActions;
     procedure Init;
@@ -147 +151 @@
 procedure TCore.DoOnWin(Player: TPlayer);
 begin
-  FormMain.Redraw;
+  RedrawClients;
   ShowMessage(Format(SPlayerWins, [Player.Name]));
 end;
@@ -174 +178 @@
   Game.SaveToFile(GetAppConfigDir(False) + 'AutoSave.xtg');
   Game.FileName := OldFileName;
-end;
-
-function TCore.GetPlayer: TPlayer;
-begin
-  Result := Game.CurrentPlayer;
 end;
 
@@ -246 +245 @@
 begin
   FirstHuman := Game.Players.GetFirstHuman;
-  if Assigned(FirstHuman) then CurrentClient := FirstHuman.Client
-    else CurrentClient := TClient(Server.Clients.First);
+  if Assigned(FirstHuman) then FormClient.Client := FirstHuman.Client
+    else FormClient.Client := TClient(Server.Clients.First);
 end;
 
@@ -276 +275 @@
   if MessageDlg(SEndGame, SEndGameQuestion, mtConfirmation, mbYesNo, 0) = mrYes then begin
     Game.Running := False;
-    FormMain.Redraw;
+    RedrawClients;
     UpdateActions;
   end;
@@ -286 +285 @@
     if Game.CurrentPlayer.Mode = pmComputer then begin
       Game.CurrentPlayer.Computer.Process;
-      FormMain.Redraw;
+      RedrawClients;
       Delay(Trunc((100 - AnimationSpeed) / 100 * 2000));
     end;
     Game.NextTurn;
-    FormMain.Redraw;
+    RedrawClients;
     Application.ProcessMessages;
     Sleep(1);
@@ -299 +298 @@
 begin
   Game.NextTurn;
-  FormMain.Redraw;
+  RedrawClients;
   ProcessComputerTurns;
   UpdateActions;
@@ -354 +353 @@
     FreeAndNil(FormHelp);
   end;
+end;
+
+procedure TCore.ANewSpectatorClientExecute(Sender: TObject);
+var
+  Form: TFormClient;
+begin
+  Form := TFormClient.Create(nil);
+  Form.Client := Game.Server.Clients.New(SSpectator);
+  //Form.Client.Form := Form;
+  Form.AZoomAll.Execute;
+  Form.Show;
 end;
 
@@ -401 +411 @@
   XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
   ForceDirectories(GetAppConfigDir(False));
+  FormClients := TObjectList.Create;
 end;
 
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
+  FreeAndNil(FormClients);
   FreeAndNil(StoredDimension);
   Game.SaveConfig(XMLConfig1, 'Game');
@@ -429 +441 @@
   SelectClient;
   LastOpenedList1.AddItem(FileName);
-  with Core.CurrentClient do
+  with FormClient.Client do
     View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0),
-      TPoint.Create(FormMain.PaintBox1.Width, FormMain.PaintBox1.Height));
-  FormMain.AZoomAll.Execute;
-  FormMain.Redraw;
+      TPoint.Create(FormClient.PaintBox1.Width, FormClient.PaintBox1.Height));
+  FormClient.AZoomAll.Execute;
+  RedrawClients;
   if FormCharts.Visible then FormCharts.Redraw;
   if FormUnitMoves.Visible then FormUnitMoves.ReloadList;
+end;
+
+procedure TCore.RedrawClients;
+var
+  Form: TFormClient;
+begin
+  for Form in FormClients do
+    Form.Redraw;
+  FormClient.Redraw;
 end;
 
@@ -446 +467 @@
   if Game.Players.GetAliveCount = Game.Players.Count then Game.Running := True
     else ShowMessage(Format(SPlayersNotInitialized, [Game.Players.Count, Game.Players.GetAliveCount]));
-  FormMain.Redraw;
+  RedrawClients;
   if FormCharts.Visible then FormCharts.Redraw;
   if FormUnitMoves.Visible then FormUnitMoves.ReloadList;
@@ -455 +476 @@
 procedure TCore.DoPlayerChange(Sender: TObject);
 begin
-  if Assigned(Game.CurrentPlayer) and Assigned(Game.CurrentPlayer.Client) then
-    CurrentClient := Game.CurrentPlayer.Client;
+  if Assigned(Game.CurrentPlayer) and Assigned(Game.CurrentPlayer.Client) then begin
+    FormClient.Client := Game.CurrentPlayer.Client;
+  end;
   if FormCharts.Visible then FormCharts.Redraw;
   if FormUnitMoves.Visible then FormUnitMoves.ReloadList;