Changeset 203 for trunk/UGameClient.pas

Timestamp:

May 18, 2018, 12:54:37 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Player turn start/end signaling from server to clients.
• Added: Save action to save game without opening save dialog.
• Fixed: Move dialog was not opened after new game was created.

File:

• trunk/UGameClient.pas (modified) (9 diffs)

trunk/UGameClient.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer;
+  Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer, UCommThread;
 
 type
@@ -22 +22 @@
     FOnReceive: TCommandEvent;
     FOnMove: TMoveEvent;
+    FOnTurnStart: TNotifyEvent;
+    CommThread: TCommThread;
     procedure SetActive(AValue: Boolean);
     procedure SetControlPlayer(AValue: TPlayer);
@@ -28 +30 @@
     procedure PlayerMove(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
       Update: Boolean; var Confirm: Boolean);
+    procedure SetOnMove(AValue: TMoveEvent);
   protected
     procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream); virtual;
@@ -45 +48 @@
     property Game: TGame read FGame write SetGame;
     property Form: TForm read FForm write SetForm;
-    property OnMove: TMoveEvent read FOnMove write FOnMove;
+    property OnMove: TMoveEvent read FOnMove write SetOnMove;
     property OnReceive: TCommandEvent read FOnReceive write FOnReceive;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
+    property OnTurnStart: TNotifyEvent read FOnTurnStart write FOnTurnStart;
     property Active: Boolean read FActive write SetActive;
   end;
@@ -113 +117 @@
 end;
 
+procedure TClient.SetOnMove(AValue: TMoveEvent);
+begin
+  //if FOnMove = AValue then Exit;
+  FOnMove := AValue;
+end;
+
 procedure TClient.ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream);
 begin
@@ -120 +130 @@
 procedure TClient.DoTurnStart(Sender: TObject);
 begin
-
+  if Assigned(FOnTurnStart) then
+    FOnTurnStart(Self);
 end;
 
@@ -139 +150 @@
 begin
   if FActive = AValue then Exit;
+  if FActive then begin
+    case ConnectType of
+      ctLocal: begin
+        CommThread.Active := False;
+        CommThread.Ext.Disconnect;
+        CommThread.Pin.Disconnect;
+      end;
+    end;
+  end;
   FActive := AValue;
   if FActive then begin
     case ConnectType of
       ctLocal: if LocalServer.Active then begin
+        CommThread.Active := True;
+        CommThread.Pin.Connect(Protocol.Pin);
         ServerClient := LocalServer.GetNewServerClient;
         ServerClient.Player := ControlPlayer;
-        ServerClient.Protocol.Pin.Connect(Protocol.Pin);
+        ServerClient.Protocol.Pin.Connect(CommThread.Ext);
       end else raise Exception.Create('Local server is not active');
       //ctNetwork: ;
@@ -162 +184 @@
 constructor TClient.Create;
 begin
+  CommThread := TCommThread.Create(nil);
   FControlPlayer := nil;
   View := TView.Create;
@@ -173 +196 @@
   FreeAndNil(View);
   FreeAndNil(Protocol);
+  FreeAndNil(CommThread);
   inherited Destroy;
 end;