Changeset 231 for trunk/UGameClient.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/UGameClient.pas (modified) (8 diffs)

trunk/UGameClient.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer, UCommThread,
-  UThreading, UCommFrame;
+  UThreading, UCommFrame, UMap, UPlayer;
 
 type
@@ -32 +32 @@
     procedure SetControlPlayer(AValue: TPlayer);
     procedure SetForm(AValue: TForm);
-    procedure SetGame(AValue: TGame);
     procedure PlayerMove(CellFrom, CellTo: TPlayerCell; var CountOnce, CountRepeat: Integer;
       Update: Boolean; var Confirm: Boolean);
     procedure SetOnMove(AValue: TMoveEvent);
   protected
+    procedure SetGame(AValue: TGame); virtual;
     procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream); virtual;
     procedure DoTurnStartHandler(Sender: TObject); virtual;
@@ -47 +47 @@
   public
     Name: string;
-    View: TView;
     LocalServer: TServer;
     RemoteAddress: string;
@@ -54 +53 @@
     Protocol: TGameProtocolClient;
     procedure DoChange;
-    constructor Create;
+    constructor Create; virtual;
     destructor Destroy; override;
     property ControlPlayer: TPlayer read FControlPlayer write SetControlPlayer;
@@ -81 +80 @@
 implementation
 
+uses
+  UClientGUI;
+
 { TClients }
 
 function TClients.New(Name: string): TClient;
 begin
-  Result := TClient.Create;
+  Result := TClientGUI.Create;
   Result.Game := Game;
   Result.Name := Name;
@@ -115 +117 @@
   if FGame = AValue then Exit;
   FGame := AValue;
-  View.Game := AValue;
 end;
 
@@ -233 +234 @@
   CommFrame := TCommFrame.Create(nil);
   FControlPlayer := nil;
-  View := TView.Create;
   Protocol := TGameProtocolClient.Create;
   Protocol.OnTurnStart := DoTurnStartHandler;
@@ -245 +245 @@
   Form := nil;
   ControlPlayer := nil;
-  FreeAndNil(View);
   FreeAndNil(Protocol);
   FreeAndNil(CommThread);