Changeset 183 for trunk/UGame.pas

Timestamp:

Feb 9, 2018, 10:33:18 AM (6 years ago)

Author:

chronos

Message:

• Modified: Units move handling was moved from Core to FormClient as it is game client related functionality.

File:

• trunk/UGame.pas (modified) (7 diffs)

trunk/UGame.pas

@@ -415 +415 @@
   end;
 
+  TMoveEvent = procedure(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
+    Update: Boolean; var Confirm: Boolean) of object;
+
   { TClient }
 
   TClient = class
   private
+    FForm: TForm;
     FGame: TGame;
     FControlPlayer: TPlayer;
     FOnChange: TNotifyEvent;
     FOnReceive: TReceiveEvent;
+    FOnMove: TMoveEvent;
     procedure SetControlPlayer(AValue: TPlayer);
+    procedure SetForm(AValue: TForm);
     procedure SetGame(AValue: TGame);
     procedure DoChange;
   public
-    Form: TForm;
     Name: string;
     View: TView;
@@ -436 +441 @@
     property ControlPlayer: TPlayer read FControlPlayer write SetControlPlayer;
     property Game: TGame read FGame write SetGame;
+    property Form: TForm read FForm write SetForm;
+    property OnMove: TMoveEvent read FOnMove write FOnMove;
     property OnReceive: TReceiveEvent read FOnReceive write FOnReceive;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
@@ -450 +457 @@
   { TGame }
 
-  TMoveEvent = procedure(CellFrom, CellTo: TCell; var CountOnce, CountRepeat: Integer;
-    Update: Boolean; var Confirm: Boolean) of object;
   TMoveUpdatedEvent = procedure(UnitMove: TUnitMove) of object;
 
@@ -464 +469 @@
   private
     FMapType: TMapType;
-    FOnMove: TMoveEvent;
     FOnMoveUpdated: TMoveUpdatedEvent;
     FOnNewTurn: TNotifyEvent;
@@ -519 +523 @@
     property MapType: TMapType read FMapType write SetMapType;
   published
-    property OnMove: TMoveEvent read FOnMove write FOnMove;
     property OnMoveUpdated: TMoveUpdatedEvent read FOnMoveUpdated write FOnMoveUpdated;
     property OnWin: TWinEvent read FOnWin write FOnWin;
@@ -697 +700 @@
   if Assigned(FControlPlayer) then
      FControlPlayer.FClient := Self;
+end;
+
+procedure TClient.SetForm(AValue: TForm);
+begin
+  if FForm = AValue then Exit;
+  FForm := AValue;
 end;
 
@@ -2921 +2930 @@
     CountRepeat := Result.CountRepeat;
     if (Mode = pmHuman) and Confirmation and
-      Assigned(Game.FOnMove) then Game.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
+      Assigned(Client) and Assigned(Client.FOnMove) then
+        Client.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, True, Confirm);
   end else begin
     CountOnce := Power;
     CountRepeat := 0;
     if (Mode = pmHuman) and Confirmation and
-      Assigned(Game.FOnMove) then Game.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
+      Assigned(Client) and Assigned(Client.FOnMove) then
+        Client.FOnMove(CellFrom, CellTo, CountOnce, CountRepeat, False, Confirm);
   end;
   if Confirm then begin