Changeset 34

Timestamp:

Oct 13, 2019, 2:08:10 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Create new random tile only if board is moved.

File:

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

trunk/UGame.pas

@@ -717 +717 @@
 begin
   Result := False;
+  if Direction = drNone then Exit;
   Area := GetMoveArea(Direction);
   for I := 0 to Max(Board.Size.X, Board.Size.Y) - 1 do begin
@@ -878 +879 @@
   NewTile: TTile;
 begin
-  HighestValue := Board.GetHighestTileValue;
-  MoveAllAnimate(Direction);
-
-  NewTile := FillRandomTile;
-  HistoryMove := THistoryMove.Create;
-  HistoryMove.Direction := Direction;
-  HistoryMove.NewItemPos := NewTile.Index;
-  HistoryMove.NewItemValue := NewTile.Value;
-  History.Moves.Add(HistoryMove);
-
-  if not CanMove and (Board.GetEmptyTilesCount = 0) then
-    GameOver;
-  if (HighestValue < WinScore) and
-  (Board.GetHighestTileValue >= WinScore) then Win;
+  if CanMoveDirection(Direction) then begin
+    HighestValue := Board.GetHighestTileValue;
+    MoveAllAnimate(Direction);
+
+    NewTile := FillRandomTile;
+    HistoryMove := THistoryMove.Create;
+    HistoryMove.Direction := Direction;
+    HistoryMove.NewItemPos := NewTile.Index;
+    HistoryMove.NewItemValue := NewTile.Value;
+    History.Moves.Add(HistoryMove);
+
+    if not CanMove and (Board.GetEmptyTilesCount = 0) then
+      GameOver;
+    if (HighestValue < WinScore) and
+    (Board.GetHighestTileValue >= WinScore) then Win;
+  end;
 end;