Changeset 202 for trunk/UGameProtocol.pas

Timestamp:

May 17, 2018, 5:41:47 PM (6 years ago)

Author:

chronos

Message:

• Modified: AI player related code moved to UClientAI unit. It is now extension of TClient class to simulate regular human client.
• Modified: More work on client-server architecture.

File:

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

trunk/UGameProtocol.pas

@@ -22 +22 @@
     FOnGameEnd: TNotifyEvent;
     FOnGameStart: TNotifyEvent;
+    FOnTurnStart: TNotifyEvent;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
+    procedure SendCmd(Command: TCommand);
   public
     Pin: TCommPin;
+    procedure TurnEnd;
     procedure SendMessage(Text: string);
     constructor Create;
@@ -32 +35 @@
     property OnGameEnd: TNotifyEvent read FOnGameEnd
       write FOnGameEnd;
+    property OnTurnStart: TNotifyEvent read FOnTurnStart
+      write FOnTurnStart;
   end;
 
@@ -41 +46 @@
   private
     FOnSendMessage: TSendMessageEvent;
+    FOnTurnEnd: TNotifyEvent;
     procedure Receive(Sender: TCommPin; Stream: TListByte);
+    procedure SendCmd(Command: TCommand);
   public
     Pin: TCommPin;
@@ -48 +55 @@
     procedure GameStart;
     procedure GameEnd;
+    procedure TurnStart;
     property OnSendMessage: TSendMessageEvent read FOnSendMessage
       write FOnSendMessage;
+    property OnTurnEnd: TNotifyEvent read FOnTurnEnd
+      write FOnTurnEnd;
   end;
 
@@ -69 +79 @@
     if Command = Integer(cmdTextMessage) then begin
       if Assigned(FOnSendMessage) then FOnSendMessage(Data.ReadVarString);
+    end else
+    if Command = Integer(cmdTurnEnd) then begin
+      if Assigned(FOnTurnEnd) then FOnTurnEnd(Self);
     end;
   finally
@@ -75 +88 @@
 end;
 
-constructor TGameProtocolServer.Create;
-begin
-  Pin := TCommPin.Create;
-  Pin.OnReceive := Receive;
-end;
-
-destructor TGameProtocolServer.Destroy;
-begin
-  Pin.Free;
-  inherited Destroy;
-end;
-
-procedure TGameProtocolServer.GameStart;
+procedure TGameProtocolServer.SendCmd(Command: TCommand);
 var
   Data: TVarBlockSerializer;
@@ -95 +96 @@
   Data2 := TListByte.Create;
   try
-    Data.WriteVarUInt(Integer(cmdGameStart));
+    Data.WriteVarUInt(Integer(Command));
     Data.Stream.Position := 0;
     Data.ReadVarList(Data2);
@@ -105 +106 @@
 end;
 
+constructor TGameProtocolServer.Create;
+begin
+  Pin := TCommPin.Create;
+  Pin.OnReceive := Receive;
+end;
+
+destructor TGameProtocolServer.Destroy;
+begin
+  Pin.Free;
+  inherited Destroy;
+end;
+
+procedure TGameProtocolServer.GameStart;
+begin
+  SendCmd(cmdGameStart);
+end;
+
 procedure TGameProtocolServer.GameEnd;
-var
-  Data: TVarBlockSerializer;
-  Data2: TListByte;
-begin
-  Data := TVarBlockSerializer.Create;
-  Data2 := TListByte.Create;
-  try
-    Data.WriteVarUInt(Integer(cmdGameEnd));
-    Data.Stream.Position := 0;
-    Data.ReadVarList(Data2);
-    Pin.Send(Data2);
-  finally
-    Data2.Free;
-    Data.Free;
-  end;
+begin
+  SendCmd(cmdGameEnd);
+end;
+
+procedure TGameProtocolServer.TurnStart;
+begin
+  SendCmd(cmdTurnStart);
 end;
 
@@ -131 +141 @@
 begin
   Data := TVarBlockSerializer.Create;
-  Data.ReadVarList(Stream);
+  Data.WriteVarList(Stream);
   Data.Stream.Position := 0;
   Command := Data.ReadVarSInt;
@@ -140 +150 @@
     if Command = Integer(cmdGameEnd) then begin
       if Assigned(FOnGameEnd) then FOnGameEnd(Self);
+    end else
+    if Command = Integer(cmdTurnStart) then begin
+      if Assigned(FOnTurnStart) then FOnTurnStart(Self);
     end;
   finally
     Data.Free;
   end;
+end;
+
+procedure TGameProtocolClient.SendCmd(Command: TCommand);
+var
+  Data: TVarBlockSerializer;
+  Data2: TListByte;
+begin
+  Data := TVarBlockSerializer.Create;
+  Data2 := TListByte.Create;
+  try
+    Data.WriteVarUInt(Integer(Command));
+    Data.Stream.Position := 0;
+    Data.ReadVarList(Data2);
+    Pin.Send(Data2);
+  finally
+    Data2.Free;
+    Data.Free;
+  end;
+end;
+
+procedure TGameProtocolClient.TurnEnd;
+begin
+  SendCmd(cmdTurnEnd);
 end;