Changeset 37 for trunk

Timestamp:

Oct 13, 2019, 5:20:58 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Initial tiles in moves history were not correctly initialized.

Location:

trunk

Files:

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

trunk/Forms/UFormMain.pas

@@ -88 +88 @@
   Core.PersistentForm1.Load(Self);
   UpdateInterface;
-  if Core.Game.Board.GetEmptyTilesCount > Core.Game.Board.Size.X * Core.Game.Board.Size.Y - 2 then
+  if Core.Game.Board.GetEmptyTilesCount > Core.Game.Board.Size.X * Core.Game.Board.Size.Y -
+    InitialTileCount then
     Core.Game.New;
 end;

trunk/UGame.pas

@@ -152 +152 @@
   );
   DirectionText: array[TMoveDirection] of string = ('None', 'Left', 'Up', 'Right', 'Down');
+  InitialTileCount = 2;
 
 resourcestring
@@ -482 +483 @@
     Result := EmptyTiles[Random(EmptyTiles.Count)];
     Result.Value := NewValue;
-    if RecordHistory then begin
-      SetLength(History.InitialTilesPos, Length(History.InitialTilesPos) + 1);
-      History.InitialTilesPos[Length(History.InitialTilesPos) - 1] := Result.Index;
-    end;
   end;
   EmptyTiles.Free;
@@ -529 +526 @@
   Running := True;
   History.Clear;
-  for I := 0 to 1 do
-    FillRandomTile(0);
+  if RecordHistory then begin
+    for I := 0 to InitialTileCount - 1 do begin
+      SetLength(History.InitialTilesPos, Length(History.InitialTilesPos) + 1);
+      History.InitialTilesPos[Length(History.InitialTilesPos) - 1] := FillRandomTile(0).Index;
+    end;
+  end else begin
+    for I := 0 to InitialTileCount - 1 do
+      FillRandomTile(0);
+  end;
   DoChange;
 end;