Changeset 19 for trunk

Timestamp:

Oct 5, 2019, 1:00:29 PM (5 years ago)

Author:

chronos

Message:

• Added: Remember board state between application restarts.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• Forms/UFormSettings.lfm (modified) (2 diffs)
• Forms/UFormSettings.lrj (modified) (1 diff)
• Install/win/Game2048.iss (modified) (1 diff)
• Languages/Game2048.cs.mo (modified) ( previous)
• Languages/Game2048.cs.po (modified) (1 diff)
• Languages/Game2048.po (modified) (1 diff)
• UCore.pas (modified) (4 diffs)
• UGame.pas (modified) (5 diffs)

trunk/Forms/UFormMain.pas

@@ -89 +89 @@
   Core.PersistentForm1.RegistryContext := Core.ApplicationInfo1.GetRegistryContext;
   Core.PersistentForm1.Load(Self);
-  Core.Game.New;
+  if not Core.Game.Running then
+    Core.Game.New;
 end;
 

trunk/Forms/UFormSettings.lfm

@@ -16 +16 @@
     Height = 26
     Top = 24
-    Width = 150
-    Caption = 'Animation speed:'
+    Width = 172
+    Caption = 'Animation duration:'
     ParentColor = False
   end
@@ -52 +52 @@
   object ComboBoxLanguage: TComboBox
     Left = 208
-    Height = 43
+    Height = 42
     Top = 86
     Width = 230

trunk/Forms/UFormSettings.lrj

@@ -1 +1 @@
 {"version":1,"strings":[
 {"hash":213582195,"name":"tformsettings.caption","sourcebytes":[83,101,116,116,105,110,103,115],"value":"Settings"},
-{"hash":69745274,"name":"tformsettings.label1.caption","sourcebytes":[65,110,105,109,97,116,105,111,110,32,115,112,101,101,100,58],"value":"Animation speed:"},
+{"hash":10139450,"name":"tformsettings.label1.caption","sourcebytes":[65,110,105,109,97,116,105,111,110,32,100,117,114,97,116,105,111,110,58],"value":"Animation duration:"},
 {"hash":1339,"name":"tformsettings.buttonok.caption","sourcebytes":[79,75],"value":"OK"},
 {"hash":77089212,"name":"tformsettings.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"},

trunk/Install/win/Game2048.iss

@@ -55 +55 @@
 Source: "{#MyAppSubDir}\lib\x86_64-win64-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-;Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
+Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
 
 

trunk/Languages/Game2048.cs.po

@@ -99 +99 @@
 
 #: tformsettings.label1.caption
-msgid "Animation speed:"
-msgstr "Rychlost animace:"
+msgid "Animation duration:"
+msgstr "Trvání animace:"
 
 #: tformsettings.label2.caption

trunk/Languages/Game2048.po

@@ -89 +89 @@
 
 #: tformsettings.label1.caption
-msgid "Animation speed:"
+msgid "Animation duration:"
 msgstr ""
 

trunk/UCore.pas

@@ -115 +115 @@
     CurrentContext := ApplicationInfo1.GetRegistryContext;
 
-    Game.TopScore := ReadIntegerWithDefault('TopScore', 0);
-    Game.Board.Size := Point(ReadIntegerWithDefault('SizeX', 4), ReadIntegerWithDefault('SizeY', 4));
-    Game.AnimationDuration := ReadIntegerWithDefault('AnimationDuration', 30);
     if ValueExists('LanguageCode') then
       Translator1.Language := Translator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
@@ -124 +121 @@
     Free;
   end;
+  Game.LoadFromRegistry(ApplicationInfo1.GetRegistryContext);
 end;
 
@@ -132 +130 @@
     CurrentContext := ApplicationInfo1.GetRegistryContext;
 
-    WriteInteger('TopScore', Game.TopScore);
-    WriteInteger('SizeX', Game.Board.Size.X);
-    WriteInteger('SizeY', Game.Board.Size.Y);
-    WriteInteger('AnimationDuration', Game.AnimationDuration);
     if Assigned(Translator1.Language) and (Translator1.Language.Code <> '') then
       WriteString('LanguageCode', Translator1.Language.Code)
@@ -142 +136 @@
     Free;
   end;
+  Game.SaveToRegistry(ApplicationInfo1.GetRegistryContext);
 end;
 

trunk/UGame.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Dialogs, fgl, Graphics, Types, Forms, Math, DateUtils,
-  Controls;
+  Controls, URegistry;
 
 type
@@ -39 +39 @@
     function GetEmptyTilesCount: Integer;
     procedure GetEmptyTiles(EmptyTiles: TTiles);
+    procedure SaveToRegistry(RegContext: TRegistryContext);
+    procedure LoadFromRegistry(RegContext: TRegistryContext);
     destructor Destroy; override;
     property Size: TPoint read FSize write SetSize;
@@ -72 +74 @@
     procedure MoveTile(SourceTile, TargetTile: TTile);
     function IsValidPos(Pos: TPoint): Boolean;
+    procedure SaveToRegistry(RegContext: TRegistryContext);
+    procedure LoadFromRegistry(RegContext: TRegistryContext);
     constructor Create;
     destructor Destroy; override;
@@ -131 +135 @@
       if Tiles[Y, X].Value = 0 then
         EmptyTiles.Add(Tiles[Y, X]);
+end;
+
+procedure TBoard.SaveToRegistry(RegContext: TRegistryContext);
+var
+  X, Y: Integer;
+  Value: string;
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := RegContext;
+
+    Value := '';
+    for Y := 0 to Size.Y - 1 do begin
+      for X := 0 to Size.X - 1 do begin
+        Value := Value + IntToStr(Tiles[Y, X].Value);
+        if X < Size.X - 1 then Value := Value + ',';
+      end;
+      if Y < Size.Y - 1 then Value := Value + ';'
+    end;
+    WriteString('TileValues', Value);
+  finally
+    Free;
+  end;
+end;
+
+procedure TBoard.LoadFromRegistry(RegContext: TRegistryContext);
+var
+  X, Y: Integer;
+  Items: TStringList;
+  Lines: TStringList;
+  Number: Integer;
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := RegContext;
+
+    Items := TStringList.Create;
+    Items.Delimiter := ',';
+    Lines := TStringList.Create;
+    Lines.Delimiter := ';';
+    Lines.DelimitedText := ReadStringWithDefault('TileValues', '');
+    for Y := 0 to Lines.Count - 1 do begin
+      Items.DelimitedText := Lines[Y];
+      for X := 0 to Items.Count - 1 do begin
+        if TryStrToInt(Items[X], Number) and (X < Size.X) and (Y < Size.Y) then
+          Tiles[Y, X].Value := Number;
+      end;
+    end;
+  finally
+    Free;
+  end;
 end;
 
@@ -497 +552 @@
 end;
 
+procedure TGame.SaveToRegistry(RegContext: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := RegContext;
+
+    WriteInteger('TopScore', TopScore);
+    WriteInteger('AnimationDuration', AnimationDuration);
+    WriteInteger('SizeX', Board.Size.X);
+    WriteInteger('SizeY', Board.Size.Y);
+    WriteInteger('Score', Score);
+    WriteBool('GameRunning', FRunning);
+    WriteBool('Won', Won);
+  finally
+    Free;
+  end;
+  Board.SaveToRegistry(RegContext);
+end;
+
+procedure TGame.LoadFromRegistry(RegContext: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := RegContext;
+    Board.Size := Point(ReadIntegerWithDefault('SizeX', 4), ReadIntegerWithDefault('SizeY', 4));
+    AnimationDuration := ReadIntegerWithDefault('AnimationDuration', 30);
+    TopScore := ReadIntegerWithDefault('TopScore', 0);
+    Score := ReadIntegerWithDefault('Score', 0);
+    FRunning := ReadBoolWithDefault('GameRunning', False);
+    Won := ReadBoolWithDefault('Won', False);
+  finally
+    Free;
+  end;
+  Board.LoadFromRegistry(RegContext);
+end;
+
 constructor TGame.Create;
 begin