Changeset 257 for tags/1.3.0/UClientGUI.pas

Timestamp:

Sep 23, 2018, 12:29:16 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Selection of unit moves.

File:

• tags/1.3.0/UClientGUI.pas (modified) (2 diffs)

tags/1.3.0/UClientGUI.pas

@@ -507 +507 @@
   end;
   if Assigned(NewSelectedCell) then begin
-    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
-      SelectedCell := NewSelectedCell
-    end else
-    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
-      SelectedCell := nil;
-    end else
-    if Assigned(SelectedCell) and TGame(Game).Map.IsCellsNeighbor(NewSelectedCell.MapCell, SelectedCell.MapCell) then begin
+    if Assigned(SelectedCell) and (NewSelectedCell <> SelectedCell) and
+      TGame(Game).Map.IsCellsNeighbor(NewSelectedCell.MapCell, SelectedCell.MapCell) then begin
       if ssShift in ShiftState then begin
         // Make maximum unit move without confirmation dialog
@@ -536 +531 @@
         SelectedCell := nil;
       end;
+    end else
+    if (NewSelectedCell <> SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
+      SelectedCell := NewSelectedCell
+    end else
+    if (NewSelectedCell = SelectedCell) and (NewSelectedCell.MapCell.Player = Player) then begin
+      SelectedCell := nil;
     end;
   end;