Changeset 213 for trunk/UGameClient.pas

Timestamp:

May 24, 2018, 9:25:17 PM (6 years ago)

Author:

chronos

Message:

• Added: Button with action to surrender the game.
• Fixed: Added framing comm component for correct separation of network messages.
• Added: New game protocol command NextPlayer. GUI client will redraw map on this event to see how other players/AI fight each other.

File:

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

trunk/UGameClient.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer, UCommThread;
+  Classes, SysUtils, UGame, Forms, fgl, UGameProtocol, UGameServer, UCommThread,
+  UThreading, UCommFrame;
 
 type
@@ -22 +23 @@
     FOnDestroy: TNotifyEvent;
     FOnGameEnd: TNotifyEvent;
+    FOnNextPlayer: TNotifyEvent;
     FOnReceive: TCommandEvent;
     FOnMove: TMoveEvent;
     FOnTurnStart: TNotifyEvent;
     CommThread: TCommThread;
+    CommFrame: TCommFrame;
     procedure SetActive(AValue: Boolean);
     procedure SetControlPlayer(AValue: TPlayer);
@@ -35 +38 @@
   protected
     procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream); virtual;
-    procedure DoTurnStart(Sender: TObject); virtual;
-    procedure DoGameEnd(Sender: TObject);
+    procedure DoTurnStartHandler(Sender: TObject); virtual;
+    procedure DoTurnStart; virtual;
+    procedure DoGameEndHandler(Sender: TObject);
+    procedure DoGameEnd;
+    procedure DoNextPlayerHandler(Sender: TObject);
+    procedure DoNextPlayer;
   public
     Name: string;
@@ -51 +58 @@
     property Game: TGame read FGame write SetGame;
     property Form: TForm read FForm write SetForm;
+    property Active: Boolean read FActive write SetActive;
     property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
     property OnMove: TMoveEvent read FOnMove write SetOnMove;
@@ -57 +65 @@
     property OnTurnStart: TNotifyEvent read FOnTurnStart write FOnTurnStart;
     property OnGameEnd: TNotifyEvent read FOnGameEnd write FOnGameEnd;
-    property Active: Boolean read FActive write SetActive;
+    property OnNextPlayer: TNotifyEvent read FOnNextPlayer write FOnNextPlayer;
   end;
 
@@ -133 +141 @@
 end;
 
-procedure TClient.DoTurnStart(Sender: TObject);
+procedure TClient.DoTurnStartHandler(Sender: TObject);
+begin
+  Synchronize(DoTurnStart);
+end;
+
+procedure TClient.DoTurnStart;
 begin
   if Assigned(FOnTurnStart) then
@@ -139 +152 @@
 end;
 
-procedure TClient.DoGameEnd(Sender: TObject);
-begin
-  if Assigned(FOnGameEnd) then
-    FOnGameEnd(Self);
+procedure TClient.DoGameEndHandler(Sender: TObject);
+begin
+  Synchronize(DoGameEnd);
+end;
+
+procedure TClient.DoGameEnd;
+begin
+  if Assigned(FOnGameEnd) then FOnGameEnd(Self);
+end;
+
+procedure TClient.DoNextPlayerHandler(Sender: TObject);
+begin
+  Synchronize(DoNextPlayer);
+end;
+
+procedure TClient.DoNextPlayer;
+begin
+  if Assigned(FOnNextPlayer) then FOnNextPlayer(Self);
 end;
 
@@ -174 +201 @@
     case ConnectType of
       ctLocal: if LocalServer.Active then begin
+        CommFrame.FrameDataPin.Connect(Protocol.Pin);
+        CommFrame.RawDataPin.Connect(CommThread.Pin);
         CommThread.Active := True;
-        CommThread.Pin.Connect(Protocol.Pin);
+        CommFrame.Active := True;
         ServerClient := LocalServer.GetNewServerClient;
         ServerClient.Player := ControlPlayer;
-        ServerClient.Protocol.Pin.Connect(CommThread.Ext);
+        ServerClient.CommFrame.RawDataPin.Connect(CommThread.Ext);
       end else raise Exception.Create('Local server is not active');
       //ctNetwork: ;
@@ -196 +225 @@
 begin
   CommThread := TCommThread.Create(nil);
+  CommFrame := TCommFrame.Create(nil);
   FControlPlayer := nil;
   View := TView.Create;
   Protocol := TGameProtocolClient.Create;
-  Protocol.OnTurnStart := DoTurnStart;
-  Protocol.OnGameEnd := DoGameEnd;
+  Protocol.OnTurnStart := DoTurnStartHandler;
+  Protocol.OnGameEnd := DoGameEndHandler;
+  Protocol.OnNextPlayer := DoNextPlayerHandler;
 end;
 
@@ -210 +241 @@
   FreeAndNil(Protocol);
   FreeAndNil(CommThread);
+  FreeAndNil(CommFrame);
   inherited Destroy;
 end;