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

trunk/UCore.pas

@@ -67 +67 @@
     procedure DoPlayerChange(Sender: TObject);
     procedure DoMoveUpdated(UnitMove: TUnitMove);
-    procedure DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
-      CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
     procedure DoOnWin(Player: TPlayer);
     procedure Delay(Time: Integer);
@@ -106 +104 @@
 
 uses
-  UFormMove, UFormMain, UFormNew, UFormSettings, UFormAbout, UFormPlayer,
+  UFormMove, UFormMain, UFormNew, UFormSettings, UFormAbout,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -123 +121 @@
 
 { TCore }
-
-procedure TCore.DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
-  CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
-var
-  I: Integer;
-begin
-  if Update then FormMove.SpinEditOnce.MaxValue := CellFrom.GetAvialPower + CountOnce
-    else FormMove.SpinEditOnce.MaxValue := CellFrom.GetAvialPower;
-  FormMove.SpinEditOnce.Value := CountOnce;
-  FormMove.TrackBarOnce.Max := FormMove.SpinEditOnce.MaxValue;
-  FormMove.TrackBarOnce.Position := FormMove.SpinEditOnce.Value;
-  FormMove.SpinEditRepeat.MaxValue := Game.Map.MaxPower;
-  FormMove.SpinEditRepeat.Value := CountRepeat;
-  FormMove.TrackBarRepeat.Max := FormMove.SpinEditRepeat.MaxValue;
-  FormMove.TrackBarRepeat.Position := FormMove.SpinEditRepeat.Value;
-  FormMove.DefendCount := CellTo.Power;
-  // Attack count from other surrounding cells without current move if already exists
-  FormMove.AttackCount := 0;
-  for I := 0 to CellTo.MovesTo.Count - 1 do
-  if TUnitMove(CellTo.MovesTo[I]).CellFrom <> CellFrom then
-    FormMove.AttackCount := FormMove.AttackCount + TUnitMove(CellTo.MovesTo[I]).CountOnce;
-  FormMove.ShowWinProbability := CellTo.Player <> CellFrom.Player;
-
-  if FormMove.ShowModal = mrOk then begin
-    CountOnce := FormMove.SpinEditOnce.Value;
-    CountRepeat := FormMove.SpinEditRepeat.Value;
-    Confirm := True;
-  end else Confirm := False;
-end;
 
 procedure TCore.DoOnWin(Player: TPlayer);
@@ -401 +370 @@
 begin
   UGame.InitStrings;
-  FormPlayer.Translate;
 end;
 
@@ -408 +376 @@
   Server := TServer.Create;
   Game := TGame.Create;
-  Game.OnMove := DoOnMove;
   Game.OnMoveUpdated := DoMoveUpdated;
   Game.OnWin := DoOnWin;
@@ -485 +452 @@
   Form.AZoomAll.Execute;
   Form.Show;
+  FormClients.Add(Form);
 end;