Changeset 213 for trunk/UGameServer.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/UGameServer.pas (modified) (7 diffs)

trunk/UGameServer.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, DOM, XMLConf, fgl, UGameProtocol;
+  Classes, SysUtils, UGame, DOM, XMLConf, fgl, UGameProtocol, UCommFrame;
 
 type
@@ -15 +15 @@
   TServerClient = class
   private
-    FOnReceiveCmd: TCommandEvent;
-    procedure ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream);
     procedure DoTurnEnd(Sender: TObject);
+    procedure DoSurrender(Sender: TObject);
   public
     Game: TGame;
     Protocol: TGameProtocolServer;
     Player: TPlayer;
+    CommFrame: TCommFrame;
     procedure DoChange;
-    procedure SendCmd(Command: TCommand; DataOut, DataIn: TStream);
     procedure TurnStart;
     procedure GameEnd;
-    property OnReceiveCmd: TCommandEvent read FOnReceiveCmd write
-      FOnReceiveCmd;
+    procedure NextPlayer;
     constructor Create;
     destructor Destroy; override;
@@ -62 +60 @@
     procedure InitClients;
     procedure GameEnd;
+    procedure NextPlayer;
     procedure Clear;
     constructor Create;
@@ -94 +93 @@
 end;
 
-procedure TServerClient.SendCmd(Command: TCommand; DataOut, DataIn: TStream);
-begin
-
-end;
-
 procedure TServerClient.TurnStart;
 begin
@@ -109 +103 @@
 end;
 
+procedure TServerClient.NextPlayer;
+begin
+  Protocol.NextPlayer;
+end;
+
 constructor TServerClient.Create;
 begin
+  CommFrame := TCommFrame.Create(nil);
   Protocol := TGameProtocolServer.Create;
   Protocol.OnTurnEnd := DoTurnEnd;
+  Protocol.OnSurrender := DoSurrender;
+  Protocol.Pin.Connect(CommFrame.FrameDataPin);
 end;
 
@@ -118 +120 @@
 begin
   Protocol.Free;
+  CommFrame.Free;
   inherited Destroy;
 end;
 
-procedure TServerClient.ReceiveCmd(Command: TCommand; DataOut, DataIn: TStream);
-begin
-  if Assigned(FOnReceiveCmd) then
-    FOnReceiveCmd(Command, DataOut, DataIn);
-end;
-
 procedure TServerClient.DoTurnEnd(Sender: TObject);
 begin
+  if Game.Running then Game.NextPlayer;
+end;
+
+procedure TServerClient.DoSurrender(Sender: TObject);
+begin
+  Player.Surrender;
   if Game.Running then Game.NextPlayer;
 end;
@@ -249 +252 @@
 end;
 
+procedure TServer.NextPlayer;
+var
+  I: Integer;
+begin
+  for I := 0 to Clients.Count - 1 do
+    Clients[I].NextPlayer;
+end;
+
 procedure TServer.Clear;
 begin