Changeset 33

Timestamp:

Oct 13, 2019, 2:17:02 AM (5 years ago)

Author:

chronos

Message:

• Modified: Fixed tiles move animation.
• Fixed: Missing game over handler.

Location:

trunk

Files:

• Forms/UFormSettings.lfm (modified) (1 diff)
• UCore.pas (modified) (1 diff)
• UGame.pas (modified) (12 diffs)

trunk/Forms/UFormSettings.lfm

@@ -25 +25 @@
     Top = 16
     Width = 240
-    Max = 100
+    Max = 1000
     Position = 0
     Anchors = [akTop, akLeft, akRight]

trunk/UCore.pas

@@ -80 +80 @@
   Game.OnChange := GameChange;
   Game.OnWin := GameWin;
+  Game.OnGameOver := GameOver;
   LoadConfig;
 end;

trunk/UGame.pas

@@ -103 +103 @@
     procedure SetScore(AValue: Integer);
     procedure DoChange;
-    procedure RenderTile(Canvas: TCanvas; Tile: TTile; TileRect: TRect);
+    procedure RenderTile(Canvas: TCanvas; Tile: TTile; TileRect: TRect; WithText: Boolean);
     procedure GameOver;
     procedure Win;
@@ -608 +608 @@
         Frame.Top + Y * TileSize.Y + TileMargin,
         TileSize.X - 2 * TileMargin, TileSize.Y - 2 * TileMargin);
-      RenderTile(Canvas, Board.Tiles[Y, X], TileRect);
+      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, not Board.Tiles[Y, X].Moving);
     end;
 
@@ -621 +621 @@
         Frame.Top + Y * TileSize.Y + Trunc(Board.Tiles[Y, X].Shift.Y / 100 * TileSize.Y + TileMargin),
         TileSize.X - 2 * TileMargin, TileSize.Y - 2 * TileMargin);
-      RenderTile(Canvas, Board.Tiles[Y, X], TileRect);
+      RenderTile(Canvas, Board.Tiles[Y, X], TileRect, True);
     end;
 end;
@@ -674 +674 @@
 end;
 
-procedure TGame.RenderTile(Canvas: TCanvas; Tile: TTile; TileRect: TRect);
+procedure TGame.RenderTile(Canvas: TCanvas; Tile: TTile; TileRect: TRect; WithText: Boolean);
 var
   ValueStr: string;
@@ -680 +680 @@
 begin
   Canvas.FillRect(TileRect);
-  if Tile.Value <> 0 then begin
+  if WithText and (Tile.Value <> 0) then begin
     ValueStr := IntToStr(Tile.Value);
     Canvas.Brush.Style := bsClear;
@@ -704 +704 @@
     FCanUndo := False;
     FRunning := CanMove;
+    History.Moves.Delete(History.Moves.Count - 1);
     DoChange;
   end;
@@ -784 +785 @@
   Part: Double;
   Area: TArea;
+  TileMoved: Boolean;
 begin
   if Direction = drNone then Exit;
@@ -799 +801 @@
       end;
 
+    TileMoved := False;
     P := Area.P1;
     while P.Y <> Area.P2.Y + Area.Increment.Y do begin
@@ -812 +815 @@
               Board.Tiles[P.Y, P.X].NewValue := 0;
               Board.Tiles[P.Y, P.X].Merged := False;
+              TileMoved := True;
             end else
             if (not Board.Tiles[P.Y, P.X].Merged) and (not Board.Tiles[PNew.Y, PNew.X].Merged) and
@@ -821 +825 @@
               Board.Tiles[P.Y, P.X].Merged := False;
               Score := Score + Board.Tiles[PNew.Y, PNew.X].NewValue;
+              TileMoved := True;
             end;
           end;
@@ -828 +833 @@
       Inc(P.Y, Area.Increment.Y);
     end;
+    if not TileMoved then Break;
 
     // Animate tiles move
@@ -851 +857 @@
     for Y := 0 to Board.Size.Y - 1 do
       for X := 0 to Board.Size.X - 1 do begin
-        Board.Tiles[Y, X].Shift := Point(0, 0);
-        Board.Tiles[Y, X].Moving := False;
         Board.Tiles[Y, X].Value := Board.Tiles[Y, X].NewValue;
       end;
-    DoChange;
-  end;
+  end;
+
+  // Set final tiles values
+  for Y := 0 to Board.Size.Y - 1 do
+    for X := 0 to Board.Size.X - 1 do begin
+      Board.Tiles[Y, X].Shift := Point(0, 0);
+      Board.Tiles[Y, X].Moving := False;
+      Board.Tiles[Y, X].Value := Board.Tiles[Y, X].NewValue;
+    end;
+  DoChange;
   FMoving := False;
 end;