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

trunk/UCore.pas

@@ -45 +45 @@
     procedure AExitExecute(Sender: TObject);
     procedure AGameEndExecute(Sender: TObject);
-    procedure AGameEndTurnExecute(Sender: TObject);
     procedure AGameLoadExecute(Sender: TObject);
     procedure AGameNewExecute(Sender: TObject);
@@ -96 +95 @@
     procedure SaveConfig;
     procedure Spectate(Player: TPlayer);
-    procedure UpdateActions;
+    procedure UpdateInterface;
     procedure ScaleDPI;
     procedure Init;
@@ -250 +249 @@
 end;
 
-procedure TCore.UpdateActions;
+procedure TCore.UpdateInterface;
 begin
   Core.AGameEnd.Enabled := Core.Game.Running;
@@ -276 +275 @@
     Game.Running := False;
     Server.GameEnd;
-    UpdateActions;
-  end;
-end;
-
-procedure TCore.AGameEndTurnExecute(Sender: TObject);
-begin
-
+    UpdateInterface;
+  end;
 end;
 
@@ -302 +296 @@
     FormNew.PageControl1.TabIndex := FormNewTabIndex;
     if FormNew.ShowModal = mrOk then begin
+      Game.Running := False;
       FormNew.Save(Server);
       Game.Assign(GameSettings);
@@ -369 +364 @@
       Game.SaveConfig(XMLConfig1, 'Game');
       Server.SaveConfig(XMLConfig1, 'Server');
+      XMLConfig1.Flush;
     end;
   finally
@@ -457 +453 @@
   // Create local LocalClients for human players
   LocalClients.Clear;
+  FormClient.Client := nil;
   for Player in Game.Players do
   with Player do
@@ -484 +481 @@
   SelectClient;
   LastOpenedList1.AddItem(FileName);
-  with FormClient.Client do
-    View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0),
-      TPoint.Create(FormClient.PaintBox1.Width, FormClient.PaintBox1.Height));
   FormClient.AZoomAll.Execute;
   UpdateOtherForms;
-  UpdateActions;
+  UpdateInterface;
   ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
   if Assigned(ServerClient) then ServerClient.TurnStart
@@ -507 +501 @@
   I: Integer;
 begin
+  // Copy all actions from docked form to main form so keyboard shortcuts will be active
   for I := 0 to FormClient.ActionList1.ActionCount - 1 do begin
     Action := TAction.Create(FormMain);
@@ -539 +534 @@
   // Create local LocalClients for human players
   LocalClients.Clear;
+  FormClient.Client := nil;
   for Player in Game.Players do
   with Player do
@@ -569 +565 @@
     else ShowMessage(Format(SPlayersNotInitialized, [Game.Players.Count, Game.Players.GetAliveCount]));
   UpdateOtherForms;
-  UpdateActions;
+  UpdateInterface;
   ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
   if Assigned(ServerClient) then ServerClient.TurnStart
@@ -580 +576 @@
   ServerClient: TServerClient;
 begin
+  Application.ProcessMessages;
+  Server.NextPlayer;
   if Assigned(Game.CurrentPlayer) then begin
     if Game.CurrentPlayer.Mode = pmHuman then begin