Changeset 68 for trunk/UGame.pas

Timestamp:

Jan 26, 2020, 10:57:41 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Drawing board in AI mode.
• Fixed: Undo action was not enabled.

File:

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

trunk/UGame.pas

@@ -733 +733 @@
   I: Integer;
   Area: TArea;
+  DstTile: TTile;
+  SrcTile: TTile;
+  TileMoved: Boolean;
 begin
   if Animation then begin
@@ -746 +749 @@
   Board.ClearMerged;
   for I := 0 to Max(Board.Size.X, Board.Size.Y) - 1 do begin
+    TileMoved := False;
     P := Area.P1;
     while P.Y <> Area.P2.Y + Area.Increment.Y do begin
@@ -752 +756 @@
         PNew := P + DirectionDiff[Direction];
         if IsValidPos(PNew) then begin
-          if (Board.Tiles[P.Y, P.X].Value <> 0) then begin
-            if (Board.Tiles[PNew.Y, PNew.X].Value = 0) then begin
-              Board.Tiles[PNew.Y, PNew.X].Value := Board.Tiles[P.Y, P.X].Value;
-              Board.Tiles[PNew.Y, PNew.X].Merged := Board.Tiles[P.Y, P.X].Merged;
-              Board.Tiles[P.Y, P.X].Value := 0;
-              Board.Tiles[P.Y, P.X].Merged := False;
+          SrcTile := Board.Tiles[P.Y, P.X];
+          DstTile := Board.Tiles[PNew.Y, PNew.X];
+          if SrcTile.Value <> 0 then begin
+            if DstTile.Value = 0 then begin
+              DstTile.Value := SrcTile.Value;
+              DstTile.Merged := SrcTile.Merged;
+              SrcTile.Value := 0;
+              SrcTile.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
-            CanMergeTile(Board.Tiles[PNew.Y, PNew.X].Value, Board.Tiles[P.Y, P.X].Value) then begin
-              Board.Tiles[PNew.Y, PNew.X].Value := MergeTile(Board.Tiles[PNew.Y, PNew.X].Value, Board.Tiles[P.Y, P.X].Value);
-              Board.Tiles[PNew.Y, PNew.X].Merged := True;
-              Board.Tiles[P.Y, P.X].Value := 0;
-              Board.Tiles[P.Y, P.X].Merged := False;
-              Score := Score + GetTileSkinScore(Board.Tiles[PNew.Y, PNew.X].Value);
+            if (not SrcTile.Merged) and (not DstTile.Merged) and
+            CanMergeTile(DstTile.Value, SrcTile.Value) then begin
+              DstTile.Value := MergeTile(DstTile.Value, SrcTile.Value);
+              DstTile.Merged := True;
+              SrcTile.Value := 0;
+              SrcTile.Merged := False;
+              Score := Score + GetTileSkinScore(SrcTile.Value);
+              TileMoved := True;
             end;
           end;
@@ -773 +781 @@
       Inc(P.Y, Area.Increment.Y);
     end;
-    DoPaint;
-  end;
+    if not TileMoved then Break;
+  end;
+  DoPaint;
   FMoving := False;
 end;
@@ -811 +820 @@
     if RecordHistory then History.Moves.Delete(History.Moves.Count - 1);
     DoChange;
+    DoPaint;
   end;
 end;
@@ -1080 +1090 @@
   HistoryMove: THistoryMove;
   NewTile: TTile;
+  X, Y: Integer;
 begin
   if CanMoveDirection(Direction) then begin
@@ -1086 +1097 @@
 
     NewTile := FillRandomTile;
-    if Animation then AnimateTiles;
+    if Animation then AnimateTiles else begin
+      for Y := 0 to Board.Size.Y - 1 do
+        for X := 0 to Board.Size.X - 1 do
+          if Board.Tiles[Y, X].Action <> taNone then begin
+            Board.Tiles[Y, X].Action := taNone;
+            Board.Tiles[Y, X].Shift := Point(0, 0);
+          end;
+      DoPaint;
+    end;
 
     if RecordHistory then begin
@@ -1100 +1119 @@
     if (HighestValue < WinTileValue) and
     (Board.GetHighestTileValue >= WinTileValue) then Win;
+    DoChange;
   end;
 end;