Changeset 8 for trunk

Timestamp:

Feb 12, 2014, 9:32:54 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Cell selection and deselection on left mouse button up.

Location:

trunk

Files:

• UFormMain.pas (modified) (3 diffs)
• UGame.pas (modified) (1 diff)

trunk/UFormMain.pas

@@ -137 +137 @@
     StartViewPoint := Point(TPlayer(Game.Players[0]).View.Left, TPlayer(Game.Players[0]).View.Top);
     MoveActive := True;
-    TPlayer(Game.Players[0]).SelectCell(Point(X, Y));
-    Redraw;
   end;
 end;
@@ -155 +153 @@
       TPlayer(Game.Players[0]).View.Right - TPlayer(Game.Players[0]).View.Left,
       TPlayer(Game.Players[0]).View.Bottom - TPlayer(Game.Players[0]).View.Top);
-    TPlayer(Game.Players[0]).SelectCell(Point(X, Y));
     Redraw;
   end;
@@ -163 +160 @@
   Shift: TShiftState; X, Y: Integer);
 begin
+  if (StartMousePoint.X = X) and (StartMousePoint.Y = Y) then begin
+    TPlayer(Game.Players[0]).SelectCell(Point(X, Y));
+    Redraw;
+  end;
   MoveActive := False;
 end;

trunk/UGame.pas

@@ -110 +110 @@
 
 procedure TPlayer.SelectCell(Pos: TPoint);
-begin
-  SelectedCell := Game.Map.PosToCell(Pos, View, ViewZoom);
+var
+  NewSelectedCell: TPoint;
+begin
+  NewSelectedCell := Game.Map.PosToCell(Pos, View, ViewZoom);
+  if (NewSelectedCell.X = SelectedCell.X) and (NewSelectedCell.Y = SelectedCell.Y) then
+    SelectedCell := Point(-1, -1)
+    else SelectedCell := NewSelectedCell;
 end;