Changeset 203 for trunk/Forms/UFormClient.pas

Timestamp:

May 18, 2018, 12:54:37 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Player turn start/end signaling from server to clients.
• Added: Save action to save game without opening save dialog.
• Fixed: Move dialog was not opened after new game was created.

File:

• trunk/Forms/UFormClient.pas (modified) (10 diffs)

trunk/Forms/UFormClient.pas

@@ -76 +76 @@
     LastTimerTime: TDateTime;
     TimerPeriod: TDateTime;
+    TurnActive: Boolean;
     procedure SetClient(AValue: TClient);
     procedure DoClientChange(Sender: TObject);
-    procedure DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
+    procedure DoTurnStart(Sender: TObject);
+    procedure DoMove(CellFrom, CellTo: TCell; var CountOnce,
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
   public
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
-    procedure ReloadView;
+    procedure UpdateInterface;
     procedure Redraw;
     property Client: TClient read FClient write SetClient;
@@ -103 +105 @@
 { TFormClient }
 
-procedure TFormClient.DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
+procedure TFormClient.DoMove(CellFrom, CellTo: TCell; var CountOnce,
   CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
 var
@@ -210 +212 @@
     FClient.Form := Self;
     FClient.OnChange := DoClientChange;
-    FClient.OnMove := DoOnMove;
+    FClient.OnMove := DoMove;
+    FClient.OnTurnStart := DoTurnStart();
   end;
   Redraw;
@@ -218 +221 @@
 begin
   Redraw;
+end;
+
+procedure TFormClient.DoTurnStart(Sender: TObject);
+begin
+  TurnActive := True;
+  UpdateInterface;
 end;
 
@@ -238 +247 @@
 end;
 
-procedure TFormClient.ReloadView;
+procedure TFormClient.UpdateInterface;
 begin
   if AToolBarBigIcons.Checked then begin
@@ -255 +264 @@
   ToolBar1.Visible := AToolBarVisible.Checked;
   StatusBar1.Visible := AStatusBarVisible.Checked;
+  AGameEndTurn.Enabled := TurnActive;
 end;
 
@@ -295 +305 @@
 begin
   AToolBarBigIcons.Checked := not AToolBarBigIcons.Checked;
-  ReloadView;
+  UpdateInterface;
 end;
 
@@ -301 +311 @@
 begin
   AStatusBarVisible.Checked := not AStatusBarVisible.Checked;
-  ReloadView;
+  UpdateInterface;
 end;
 
 procedure TFormClient.AGameEndTurnExecute(Sender: TObject);
-var
-  P: TGameProtocolClient;
-  P2: TCommPin;
-begin
-  P := Client.Protocol;
-  P2 := P.Pin;
+begin
+  TurnActive := False;
   Client.Protocol.TurnEnd;
+  UpdateInterface;
 end;
 
@@ -317 +324 @@
 begin
   AToolBarVisible.Checked := not AToolBarVisible.Checked;
-  ReloadView;
+  UpdateInterface;
 end;
 
@@ -370 +377 @@
   LoadConfig(Core.XMLConfig1, 'FormClient');
   Core.PersistentForm.Load(Self);
-  ReloadView;
+  UpdateInterface;
   Redraw;
 end;