Changeset 180 for trunk/UGame.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/UGame.pas (modified) (11 diffs)

trunk/UGame.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite,
+  Classes, SysUtils, ExtCtrls, Graphics, XMLConf, XMLRead, XMLWrite, Forms,
   DOM, Math, LazFileUtils, UXMLUtils, Dialogs, Types, LCLType, LCLIntf, fgl,
   UGeometry, UGameSocket;
@@ -421 +421 @@
     FGame: TGame;
     FControlPlayer: TPlayer;
+    FOnChange: TNotifyEvent;
     FOnReceive: TReceiveEvent;
     procedure SetControlPlayer(AValue: TPlayer);
     procedure SetGame(AValue: TGame);
+    procedure DoChange;
   public
+    Form: TForm;
     Name: string;
     View: TView;
@@ -434 +437 @@
     property Game: TGame read FGame write SetGame;
     property OnReceive: TReceiveEvent read FOnReceive write FOnReceive;
+    property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
 
@@ -440 +444 @@
   TClients = class(TFPGObjectList<TClient>)
     Game: TGame;
-    procedure New(Name: string);
+    function New(Name: string): TClient;
     constructor Create(FreeObjects: Boolean = True);
   end;
@@ -534 +538 @@
     procedure SetGame(AValue: TGame);
     procedure SetServerMode(AValue: TServerMode);
+    procedure DoChange;
   public
     Clients: TClients;
@@ -565 +570 @@
 resourcestring
   SPlayer = 'Player';
+  SSpectator = 'Spectator';
 
 
@@ -650 +656 @@
 { TClients }
 
-procedure TClients.New(Name: string);
-var
-  NewClient: TClient;
-begin
-  NewClient := TClient.Create;
-  NewClient.Game := Game;
-  NewClient.Name := Name;
-  Add(NewClient);
+function TClients.New(Name: string): TClient;
+begin
+  Result := TClient.Create;
+  Result.Game := Game;
+  Result.Name := Name;
+  Add(Result);
 end;
 
@@ -673 +677 @@
   FGame := AValue;
   View.Game := AValue;
+end;
+
+procedure TClient.DoChange;
+begin
+  if Assigned(FOnChange) then
+    FOnChange(Self);
 end;
 
@@ -3201 +3211 @@
 end;
 
+procedure TServer.DoChange;
+var
+  Client: TClient;
+begin
+  for Client in Clients do
+    Client.DoChange;
+end;
+
 procedure TServer.LoadConfig(Config: TXmlConfig; Path: string);
 begin
@@ -3229 +3247 @@
 begin
   Clients.Clear;
-  Clients.New('Spectator');
+  Clients.New(SSpectator);
 
   for Player in Game.Players do
   with Player do
   if Mode = pmHuman then begin
-    Clients.New(Player.Name);
-    Player.Client := TClient(Clients.Last);
+    Player.Client := Clients.New(Player.Name);
   end;
 
@@ -3586 +3603 @@
   // For computers take view from previous human
   //if CurrentPlayer.Mode = pmComputer then CurrentPlayer.View.Assign(PrevPlayer.View);
+  Server.DoChange;
 end;