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

trunk/UGameProtocol.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UGame, UVarBlockSerializer, UCommPin, SpecializedList;
+  Classes, SysUtils, UGame, UVarBlockSerializer, UCommPin, SpecializedList,
+  UCommFrame;
 
 type
-  TCommand = (cmdTextMessage, cmdTurnStart, cmdTurnEnd, cmdGameStart, cmdGameEnd);
+  TCommand = (cmdTextMessage, cmdTurnStart, cmdTurnEnd, cmdGameStart, cmdGameEnd,
+    cmdSurrender, cmdNextPlayer);
   TCommandEvent = procedure (Command: TCommand; DataIn, DataOut: TStream);
 
@@ -22 +24 @@
     FOnGameEnd: TNotifyEvent;
     FOnGameStart: TNotifyEvent;
+    FOnNextPlayer: TNotifyEvent;
     FOnTurnStart: TNotifyEvent;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
@@ -28 +31 @@
     Pin: TCommPin;
     procedure TurnEnd;
+    procedure Surrender;
     procedure SendMessage(Text: string);
     constructor Create;
     destructor Destroy; override;
-    property OnGameStart: TNotifyEvent read FOnGameStart
-      write FOnGameStart;
-    property OnGameEnd: TNotifyEvent read FOnGameEnd
-      write FOnGameEnd;
-    property OnTurnStart: TNotifyEvent read FOnTurnStart
-      write FOnTurnStart;
+    property OnGameStart: TNotifyEvent read FOnGameStart write FOnGameStart;
+    property OnGameEnd: TNotifyEvent read FOnGameEnd write FOnGameEnd;
+    property OnTurnStart: TNotifyEvent read FOnTurnStart write FOnTurnStart;
+    property OnNextPlayer: TNotifyEvent read FOnNextPlayer write FOnNextPlayer;
   end;
 
@@ -46 +48 @@
   private
     FOnSendMessage: TSendMessageEvent;
+    FOnSurrender: TNotifyEvent;
     FOnTurnEnd: TNotifyEvent;
+    CommFrame: TCommFrame;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
     procedure SendCmd(Command: TCommand);
@@ -56 +60 @@
     procedure GameEnd;
     procedure TurnStart;
+    procedure NextPlayer;
     property OnSendMessage: TSendMessageEvent read FOnSendMessage
       write FOnSendMessage;
-    property OnTurnEnd: TNotifyEvent read FOnTurnEnd
-      write FOnTurnEnd;
+    property OnTurnEnd: TNotifyEvent read FOnTurnEnd write FOnTurnEnd;
+    property OnSurrender: TNotifyEvent read FOnSurrender write FOnSurrender;
   end;
 
@@ -82 +87 @@
     if Command = Integer(cmdTurnEnd) then begin
       if Assigned(FOnTurnEnd) then FOnTurnEnd(Self);
+    end else
+    if Command = Integer(cmdSurrender) then begin
+      if Assigned(FOnSurrender) then FOnSurrender(Self);
     end;
   finally
@@ -133 +141 @@
 end;
 
+procedure TGameProtocolServer.NextPlayer;
+begin
+  SendCmd(cmdNextPlayer);
+end;
+
 { TGameProtocol }
 
@@ -153 +166 @@
     if Command = Integer(cmdTurnStart) then begin
       if Assigned(FOnTurnStart) then FOnTurnStart(Self);
+    end else
+    if Command = Integer(cmdNextPlayer) then begin
+      if Assigned(FOnNextPlayer) then FOnNextPlayer(Self);
     end;
   finally
@@ -180 +196 @@
 begin
   SendCmd(cmdTurnEnd);
+end;
+
+procedure TGameProtocolClient.Surrender;
+begin
+  SendCmd(cmdSurrender);
 end;