Changeset 35

Timestamp:

Oct 13, 2019, 2:28:55 PM (5 years ago)

Author:

chronos

Message:

• Modified: Optimized speed of loading/storing game state to registry. Under Linux simulated as XML file.

Location:

trunk

Files:

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

trunk/Forms/UFormMain.pas

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

trunk/UGame.pas

@@ -43 +43 @@
     NewItemPos: TPoint;
     NewItemValue: Integer;
-    procedure SaveToRegistry(RegContext: TRegistryContext);
-    procedure LoadFromRegistry(RegContext: TRegistryContext);
+    procedure SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
+    procedure LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
   end;
 
@@ -50 +50 @@
 
   THistoryMoves = class(TFPGObjectList<THistoryMove>)
-    procedure SaveToRegistry(RegContext: TRegistryContext);
-    procedure LoadFromRegistry(RegContext: TRegistryContext);
+    procedure SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
+    procedure LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
   end;
 
@@ -63 +63 @@
     constructor Create;
     destructor Destroy; override;
-    procedure SaveToRegistry(RegContext: TRegistryContext);
-    procedure LoadFromRegistry(RegContext: TRegistryContext);
+    procedure SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
+    procedure LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
   end;
 
@@ -82 +82 @@
     function GetEmptyTilesCount: Integer;
     procedure GetEmptyTiles(EmptyTiles: TTiles);
-    procedure SaveToRegistry(RegContext: TRegistryContext);
-    procedure LoadFromRegistry(RegContext: TRegistryContext);
+    procedure SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
+    procedure LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
     destructor Destroy; override;
     property Size: TPoint read FSize write SetSize;
@@ -157 +157 @@
 { THistoryMoves }
 
-procedure THistoryMoves.SaveToRegistry(RegContext: TRegistryContext);
+procedure THistoryMoves.SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
 var
   I: Integer;
 begin
-  with TRegistryEx.Create do
-  try
+  with Reg do begin
     CurrentContext := RegContext;
     WriteInteger('Count', Count);
     for I := 0 to Count - 1 do begin
-      Items[I].SaveToRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '/' + IntToStr(I)));
-    end;
-  finally
-    Free;
-  end;
-end;
-
-procedure THistoryMoves.LoadFromRegistry(RegContext: TRegistryContext);
+      Items[I].SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '/' + IntToStr(I)));
+    end;
+  end;
+end;
+
+procedure THistoryMoves.LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
 var
   I: Integer;
@@ -179 +176 @@
   HistoryMove: THistoryMove;
 begin
-  with TRegistryEx.Create do
-  try
+  with Reg do begin
     CurrentContext := RegContext;
     C := ReadIntegerWithDefault('Count', 0);
@@ -186 +182 @@
       HistoryMove := THistoryMove.Create;
       Add(HistoryMove);
-      HistoryMove.LoadFromRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '/' + IntToStr(I)));
-    end;
-  finally
-    Free;
+      HistoryMove.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '/' + IntToStr(I)));
+    end;
   end;
 end;
@@ -195 +189 @@
 { THistoryMove }
 
-procedure THistoryMove.SaveToRegistry(RegContext: TRegistryContext);
-begin
-  with TRegistryEx.Create do
-  try
+procedure THistoryMove.SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
+begin
+  with Reg do begin
     CurrentContext := RegContext;
     WriteInteger('Direction', Integer(Direction));
@@ -204 +197 @@
     WriteInteger('NewItemPosY', NewItemPos.Y);
     WriteInteger('NewItemValue', NewItemValue);
-  finally
-    Free;
-  end;
-end;
-
-procedure THistoryMove.LoadFromRegistry(RegContext: TRegistryContext);
-begin
-  with TRegistryEx.Create do
-  try
+  end;
+end;
+
+procedure THistoryMove.LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
+begin
+  with Reg do begin
     CurrentContext := RegContext;
     Direction := TMoveDirection(ReadIntegerWithDefault('Direction', Integer(drNone)));
@@ -218 +208 @@
       ReadIntegerWithDefault('NewItemPosY', 0));
     NewItemValue := ReadIntegerWithDefault('NewItemValue', 0);
-  finally
-    Free;
   end;
 end;
@@ -254 +242 @@
 end;
 
-procedure THistory.SaveToRegistry(RegContext: TRegistryContext);
+procedure THistory.SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
 var
   I: Integer;
 begin
-  with TRegistryEx.Create do
-  try
+  with Reg do begin
     CurrentContext := TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\InitialTilesPos');
     WriteInteger('Count', Length(InitialTilesPos));
@@ -266 +253 @@
       WriteInteger('Y' + IntToStr(I), InitialTilesPos[I].Y);
     end;
-  finally
-    Free;
-  end;
-  Moves.SaveToRegistry(RegContext);
-end;
-
-procedure THistory.LoadFromRegistry(RegContext: TRegistryContext);
+    Moves.SaveToRegistry(Reg, RegContext);
+  end;
+end;
+
+procedure THistory.LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
 var
   I: Integer;
 begin
-  with TRegistryEx.Create do
-  try
+  with Reg do begin
     CurrentContext := TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\InitialTilesPos');
     SetLength(InitialTilesPos, ReadIntegerWithDefault('Count', 0));
@@ -284 +268 @@
         ReadIntegerWithDefault('Y' + IntToStr(I), 0));
     end;
-  finally
-    Free;
-  end;
-  Moves.LoadFromRegistry(RegContext);
+  end;
+  Moves.LoadFromRegistry(Reg, RegContext);
 end;
 
@@ -349 +331 @@
 end;
 
-procedure TBoard.SaveToRegistry(RegContext: TRegistryContext);
+procedure TBoard.SaveToRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
 var
   X, Y: Integer;
   Value: string;
 begin
-  with TRegistryEx.Create do
-  try
+  with Reg do begin
     CurrentContext := RegContext;
 
@@ -369 +350 @@
     end;
     WriteString('TileValues', Value);
-  finally
-    Free;
-  end;
-end;
-
-procedure TBoard.LoadFromRegistry(RegContext: TRegistryContext);
+  end;
+end;
+
+procedure TBoard.LoadFromRegistry(Reg: TRegistryEx; RegContext: TRegistryContext);
 var
   X, Y: Integer;
@@ -381 +360 @@
   Number: Integer;
 begin
-  with TRegistryEx.Create do
-  try
+  with Reg do begin
     CurrentContext := RegContext;
 
@@ -400 +378 @@
     Lines.Free;
     Items.Free;
-  finally
-    Free;
   end;
 end;
@@ -912 +888 @@
 
 procedure TGame.SaveToRegistry(RegContext: TRegistryContext);
-begin
-  with TRegistryEx.Create do
+var
+  Reg: TRegistryEx;
+begin
+  Reg := TRegistryEx.Create;
+  with Reg do
   try
     CurrentContext := RegContext;
@@ -923 +902 @@
     WriteBool('CanUndo', FCanUndo);
     WriteBool('UndoEnabled', UndoEnabled);
+    FBoardUndo.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
+    Board.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
+    History.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\History'));
   finally
     Free;
   end;
-  FBoardUndo.SaveToRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
-  Board.SaveToRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
-  History.SaveToRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\History'));
 end;
 
 procedure TGame.LoadFromRegistry(RegContext: TRegistryContext);
-begin
-  with TRegistryEx.Create do
+var
+  Reg: TRegistryEx;
+begin
+  Reg := TRegistryEx.Create;
+  with Reg do
   try
     CurrentContext := RegContext;
@@ -942 +924 @@
     FCanUndo := ReadBoolWithDefault('CanUndo', False);
     UndoEnabled := ReadBoolWithDefault('UndoEnabled', True);
+    FBoardUndo.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
+    Board.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
+    History.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\History'));
   finally
     Free;
   end;
-  FBoardUndo.LoadFromRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
-  Board.LoadFromRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
-  History.LoadFromRegistry(TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\History'));
   DoChange;
 end;