Changeset 205 for trunk

Timestamp:

May 20, 2018, 11:19:57 PM (7 years ago)

Author:

chronos

Message:

• Fixed: Show correctly units move dialog after new game is created.
• Fixed: Missing hints in client form toolbar.
• Fixed: Recalculate players stats after game was loaded from file.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (4 diffs)
• UGame.pas (modified) (1 diff)
• UGameClient.pas (modified) (3 diffs)

trunk/Forms/UFormClient.pas

@@ -82 +82 @@
     procedure DoMove(CellFrom, CellTo: TCell; var CountOnce,
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
+    procedure SetToolbarHints;
+    procedure DoClientDestroy(Sender: TObject);
   public
     procedure LoadConfig(Config: TXmlConfig; Path: string);
@@ -104 +106 @@
 
 { TFormClient }
+
+procedure TFormClient.SetToolbarHints;
+var
+  I: Integer;
+begin
+  for I := 0 to ToolBar1.ButtonCount - 1 do begin
+    ToolBar1.Buttons[I].ShowHint := True;
+    ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
+  end;
+end;
+
+procedure TFormClient.DoClientDestroy(Sender: TObject);
+begin
+  Client := nil;
+end;
 
 procedure TFormClient.DoMove(CellFrom, CellTo: TCell; var CountOnce,
@@ -213 +230 @@
     FClient.OnChange := DoClientChange;
     FClient.OnMove := DoMove;
-    FClient.OnTurnStart := DoTurnStart();
+    FClient.OnTurnStart := DoTurnStart;
+    FClient.OnDestroy := DoClientDestroy;
   end;
   Redraw;
@@ -375 +393 @@
 procedure TFormClient.FormShow(Sender: TObject);
 begin
+  SetToolbarHints;
   LoadConfig(Core.XMLConfig1, 'FormClient');
   Core.PersistentForm.Load(Self);

trunk/UGame.pas

@@ -3057 +3057 @@
         Players[I].PlayerMap.CheckVisibility;
       end;
+      Map.ComputePlayerStats;
       Running := ReadBoolean(RootNode, 'Running', True);
     end;

trunk/UGameClient.pas

@@ -20 +20 @@
     FControlPlayer: TPlayer;
     FOnChange: TNotifyEvent;
+    FOnDestroy: TNotifyEvent;
     FOnReceive: TCommandEvent;
     FOnMove: TMoveEvent;
@@ -48 +49 @@
     property Game: TGame read FGame write SetGame;
     property Form: TForm read FForm write SetForm;
+    property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
     property OnMove: TMoveEvent read FOnMove write SetOnMove;
     property OnReceive: TCommandEvent read FOnReceive write FOnReceive;
@@ -193 +195 @@
 destructor TClient.Destroy;
 begin
+  Form := nil;
   ControlPlayer := nil;
   FreeAndNil(View);