Changeset 107 for trunk/Game.pas

Timestamp:

Dec 9, 2024, 10:39:50 PM (12 days ago)

Author:

chronos

Message:

• Fixed: Use the same initial board after game restart.

File:

• trunk/Game.pas (modified) (9 diffs)

trunk/Game.pas

@@ -63 +63 @@
   public
     Board: TBoard;
+    InitialBoard: TBoard;
     TopScore: Integer;
     AnimationDuration: Integer;
@@ -78 +79 @@
     function CanMove: Boolean;
     procedure Assign(Source: TGame);
+    procedure Reset;
     procedure New;
+    procedure Restart;
     procedure Render(Canvas: TCanvas; CanvasSize: TPoint);
     procedure MoveAll(Direction: TMoveDirection; Animation: Boolean);
@@ -310 +313 @@
 end;
 
-procedure TGame.New;
-var
-  I: Integer;
-  Tile: TTile;
+procedure TGame.Reset;
 const
   Difficulty = 0.7;
@@ -323 +323 @@
   Running := True;
   History.Clear;
-
+end;
+
+procedure TGame.New;
+var
+  I: Integer;
+  Tile: TTile;
+begin
+  Reset;
 
   if RecordHistory then begin
@@ -351 +358 @@
       FillUnmergeableRandomTile;
   end;
+  InitialBoard.Assign(Board);
+  AnimateTiles;
+  DoChange;
+  DoPaint;
+end;
+
+procedure TGame.Restart;
+begin
+  Reset;
+  Board.Assign(InitialBoard);
   AnimateTiles;
   DoChange;
@@ -1038 +1055 @@
     FBoardUndo.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
     Board.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
+    InitialBoard.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\InitialBoard'));
     History.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\History'));
   finally
@@ -1065 +1083 @@
     FBoardUndo.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
     Board.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
+    InitialBoard.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\InitialBoard'));
     History.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\History'));
   finally
@@ -1079 +1098 @@
   WinTileValue := 11; // 2^11 = 2048
   Board := TBoard.Create;
+  InitialBoard := TBoard.Create;
   FBoardUndo := TBoard.Create;
   History := THistory.Create;
@@ -1089 +1109 @@
   FreeAndNil(FBoardUndo);
   FreeAndNil(Board);
+  FreeAndNil(InitialBoard);
   inherited;
 end;