Changeset 274 for trunk/UClientGUI.pas

Timestamp:

Feb 3, 2019, 8:32:20 PM (6 years ago)

Author:

chronos

Message:

• Added: Keep information about available unit moves during turn.
• Added: Allow to move units instantly during turn.
• Added: Game system parameter to play without possibility to merge/split units.

File:

• trunk/UClientGUI.pas (modified) (3 diffs)

trunk/UClientGUI.pas

@@ -352 +352 @@
           if Assigned(SelectedCell) and (SelectedCell = Cell) then
               Brush.Color := clGreen
-            else if Assigned(SelectedCell) and TGame(Game).Map.IsCellsNeighbor(SelectedCell.MapCell, Cell.MapCell) then
+            else if Assigned(SelectedCell) and ControlPlayer.IsAllowedMoveTarget(SelectedCell, Cell) then
               Brush.Color := clPurple
             else if TGame(Game).FogOfWar then begin
@@ -616 +616 @@
   if Assigned(NewSelectedCell) then begin
     if Assigned(SelectedCell) and (NewSelectedCell <> SelectedCell) and
-      TGame(Game).Map.IsCellsNeighbor(NewSelectedCell.MapCell, SelectedCell.MapCell) then begin
+    TGame(Game).CurrentPlayer.IsAllowedMoveTarget(SelectedCell, NewSelectedCell) then begin
       if ssShift in ShiftState then begin
         // Make maximum unit move without confirmation dialog
@@ -640 +640 @@
       end;
     end else
-    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
+    if not Assigned(SelectedCell) and (NewSelectedCell <> SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
       SelectedCell := NewSelectedCell
     end else