Changeset 34 for trunk/Forms/UMainForm.pas

Timestamp:

Nov 25, 2017, 12:27:33 AM (7 years ago)

Author:

chronos

Message:

• Modified: Improved New game window.
• Modified: Used newer version of Common and CoolTranslator packages.

Location:

trunk

Files:

• . (modified) (1 prop)
• Forms/UMainForm.pas (modified) (9 diffs)

trunk

@@ -3 +3 @@
 backup
 tunneler.exe
+tunneler.dbg
+tunneler.lps
 heaptrclog.trc
-tunneler.lps
+Components/Common/Languages/*.mo
+Components/CoolTranslator/Demo/lib

@@ -3 +3 @@
 backup
 tunneler.exe
+tunneler.dbg
+tunneler.lps
 heaptrclog.trc
-tunneler.lps
+Components/Common/Languages/*.mo
+Components/CoolTranslator/Demo/lib

trunk/Forms/UMainForm.pas

@@ -8 +8 @@
   Registry, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   ComCtrls, Menus, ActnList, UCore, UPlatform, Math, DateUtils, GraphType,
-  UPersistentForm, UApplicationInfo, UCoolTranslator, LCLType;
+  UPersistentForm, UApplicationInfo, UCoolTranslator, LCLType, URegistry;
 
 type
@@ -53 +53 @@
     procedure TimerDrawTimer(Sender: TObject);
     procedure TimerEngineTickTimer(Sender: TObject);
-    procedure EraseBackground(DC: HDC); override;
   private
     OriginalBounds: TRect;
@@ -64 +63 @@
     PersistentForm: TPersistentForm;
     Engine: TEngine;
-  end; 
+    procedure EraseBackground(DC: HDC); override;
+  end;
 
 var
@@ -89 +89 @@
     StartTime := NowPrecise;
     //Engine.Draw;
-    DrawDuration := NowPrecise - StartTime;
     try
       Engine.Lock.Acquire;
@@ -95 +94 @@
       //  IntToStr(TPlayer(Engine.Players[0]).Position.Y) + ' ' +
       //  IntToStr(TPlayer(Engine.Players[0]).Direction);
-      StatusBar1.Panels[2].Text := FloatToStr(RoundTo(DrawDuration / OneMillisecond, -2));
+      StatusBar1.Panels[2].Text := FloatToStr(RoundTo(Engine.DrawDuration / OneMillisecond, -2));
       StatusBar1.Panels[3].Text := Format(SRound, [IntToStr(Engine.CurrentRound),
         IntToStr(Engine.MaxRound)]);
@@ -118 +117 @@
 procedure TMainForm.FormCreate(Sender: TObject);
 begin
-  PersistentForm := TPersistentForm.Create;
-  PersistentForm.RegistryKey := ApplicationInfo1.RegistryKey;
-  PersistentForm.RegistryRootKey := HKEY(ApplicationInfo1.RegistryRoot);
+  PersistentForm := TPersistentForm.Create(nil);
+  PersistentForm.RegistryContext := RegContext(HKEY(ApplicationInfo1.RegistryRoot),
+    ApplicationInfo1.RegistryKey);
 
   Application.OnDeactivate := FormDeactivate;
@@ -130 +129 @@
   Engine.Active := True;
   Image1Resize(Self);
+
+  Image1.ControlStyle := Image1.ControlStyle + [csOpaque];
 end;
 
@@ -172 +173 @@
 procedure TMainForm.ANewGameExecute(Sender: TObject);
 begin
-  if NewGameForm.ShowModal = mrOk then Engine.NewGame;
+  NewGameForm.LoadData(Engine);
+  if NewGameForm.ShowModal = mrOk then begin
+    NewGameForm.SaveData(Engine);
+    Engine.NewGame;
+  end;
 end;
 
@@ -212 +217 @@
   PersistentForm.Load(Self);
   CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('cs');
-  DebugForm.Show;
 end;
 

@@ -3 +3 @@
 backup
 tunneler.exe
+tunneler.dbg
+tunneler.lps
 heaptrclog.trc
-tunneler.lps
+Components/Common/Languages/*.mo
+Components/CoolTranslator/Demo/lib