Changeset 211 for trunk/UCore.pas

Timestamp:

May 23, 2018, 8:53:58 PM (6 years ago)

Author:

chronos

Message:

• Modified: Each client form is redrawn by itself, not by Core.

File:

• trunk/UCore.pas (modified) (8 diffs)

trunk/UCore.pas

@@ -70 +70 @@
     procedure LoadRecentExecute(Sender: TObject);
     procedure StartNewGame;
+    procedure LoadGame(FileName: string);
     procedure DoPlayerChange(Sender: TObject);
     procedure DoMoveUpdated(UnitMove: TUnitMove);
@@ -78 +79 @@
     procedure CommandLineParams;
     procedure SelectClient;
-    procedure LoadGame(FileName: string);
-    procedure RedrawClients;
     procedure UpdateOtherForms;
     procedure FormClientActions;
@@ -139 +138 @@
   I: Integer;
 begin
-  RedrawClients;
+  Server.GameEnd;
   if Assigned(Player) then
     ShowMessage(Format(SPlayerWins, [Player.Name]))
@@ -276 +275 @@
   if MessageDlg(SEndGame, SEndGameQuestion, mtConfirmation, mbYesNo, 0) = mrYes then begin
     Game.Running := False;
-    RedrawClients;
+    Server.GameEnd;
     UpdateActions;
   end;
@@ -489 +488 @@
       TPoint.Create(FormClient.PaintBox1.Width, FormClient.PaintBox1.Height));
   FormClient.AZoomAll.Execute;
-  RedrawClients;
   UpdateOtherForms;
   UpdateActions;
@@ -495 +493 @@
   if Assigned(ServerClient) then ServerClient.TurnStart
     else raise Exception.Create(SMissingServerClientForPlayer);
-end;
-
-procedure TCore.RedrawClients;
-var
-  Form: TFormClient;
-begin
-  for Form in FormClients do
-    Form.Redraw;
-  FormClient.Redraw;
 end;
 
@@ -579 +568 @@
   if Game.Players.GetAliveCount = Game.Players.Count then Game.Running := True
     else ShowMessage(Format(SPlayersNotInitialized, [Game.Players.Count, Game.Players.GetAliveCount]));
-  FormClient.AZoomAll.Execute;
-  RedrawClients;
   UpdateOtherForms;
   UpdateActions;
@@ -594 +581 @@
 begin
   if Assigned(Game.CurrentPlayer) then begin
-    PlayerClient := LocalClients.SearchPlayer(Game.CurrentPlayer);
-    if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
+    if Game.CurrentPlayer.Mode = pmHuman then begin
+      PlayerClient := LocalClients.SearchPlayer(Game.CurrentPlayer);
+      if Assigned(PlayerClient) then FormClient.Client := PlayerClient;
+    end;
 
     ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);