Changeset 27 for trunk/UGame.pas

Timestamp:

Oct 5, 2019, 10:55:00 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Update previous board state for undo only if board is really moved.

File:

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

trunk/UGame.pas

@@ -76 +76 @@
     procedure New;
     procedure Render(Canvas: TCanvas; CanvasSize: TPoint);
-    function MoveAll(Direction: TDirection): Integer;
+    procedure MoveAll(Direction: TDirection);
     procedure MoveTile(SourceTile, TargetTile: TTile);
     function IsValidPos(Pos: TPoint): Boolean;
@@ -472 +472 @@
 end;
 
-function TGame.MoveAll(Direction: TDirection): Integer;
+procedure TGame.MoveAll(Direction: TDirection);
 var
   StartPoint: TPoint;
@@ -481 +481 @@
   PNew: TPoint;
   PI: TPoint;
-  MovedCount: Integer;
   X, Y: Integer;
   I: Integer;
@@ -490 +489 @@
   HighestValue: Integer;
 begin
+  if not CanMoveDirection(Direction) then Exit;
   FMoving := True;
   HighestValue := Board.GetHighestTileValue;
@@ -521 +521 @@
     end;
   end;
-  MovedCount := 0;
   Board.ClearMerged;
   for I := 0 to Max(Board.Size.X, Board.Size.Y) - 1 do begin
@@ -545 +544 @@
               Board.Tiles[P.Y, P.X].NewValue := 0;
               Board.Tiles[P.Y, P.X].Merged := False;
-              Inc(MovedCount);
             end else
             if (not Board.Tiles[P.Y, P.X].Merged) and (not Board.Tiles[PNew.Y, PNew.X].Merged) and
@@ -554 +552 @@
               Board.Tiles[P.Y, P.X].NewValue := 0;
               Board.Tiles[P.Y, P.X].Merged := False;
-              Inc(MovedCount);
               Score := Score + Board.Tiles[PNew.Y, PNew.X].NewValue;
             end;
@@ -596 +593 @@
     DoChange;
   end;
-  Result := MovedCount;
 
   // Update state after move
-  if MovedCount > 0 then FillRandomTile;
+  FillRandomTile;
   if not CanMove and (Board.GetEmptyTilesCount = 0) then
     GameOver;