Changeset 66

Timestamp:

Jan 14, 2017, 12:37:47 PM (7 years ago)

Author:

chronos

Message:

• Fixed: OptionChecked variable was incorrectly initialized as CreateParams method of TMainScreen was called after FormCreate. Moved options processing to FormCreate after load from registy.

Location:

trunk

Files:

• Integrated.lpi (modified) (1 diff)
• LocalPlayer/LocalPlayer.pas (modified) (1 diff)
• LocalPlayer/Term.lfm (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (5 diffs)

trunk/Integrated.lpi

@@ -446 +446 @@
       </Checks>
       <VerifyObjMethodCallValidity Value="True"/>
+      <TargetCPU Value="i386"/>
+      <TargetOS Value="win32"/>
     </CodeGeneration>
     <Linking>

trunk/LocalPlayer/LocalPlayer.pas

@@ -25 +25 @@
     FormsCreated := true;
     BaseWin.CreateOffscreen;
+    // TODO: Changing application name in runtime will cause change of Linux XML registry file path
 //    Application.MainForm := MainScreen;
     Application.CreateForm(TMainScreen, MainScreen);
-    MainScreen.HandleNeeded; // Force to call CreateParams method
     Application.CreateForm(TCityDlg, CityDlg);
     Application.CreateForm(TModalSelectDlg, ModalSelectDlg);

trunk/LocalPlayer/Term.lfm

@@ -29 +29 @@
   OnShow = FormShow
   Position = poDefault
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.2.0'
   WindowState = wsMaximized
   object UnitBtn: TButtonB

trunk/LocalPlayer/Term.pas

@@ -3363 +3363 @@
 
 procedure TMainScreen.CreateParams(var p: TCreateParams);
+begin
+  inherited;
+
+  if FullScreen then
+  begin
+    p.Style := $87000000;
+    BorderStyle := bsNone;
+    BorderIcons := [];
+  end;
+end;
+
+procedure TMainScreen.FormCreate(Sender: TObject);
 var
   DefaultOptionChecked: integer;
   Reg: TRegistry;
-  doinit: boolean;
-begin
-  inherited;
-
-  // define which menu settings to save
+  i, j: integer;
+begin
+   // define which menu settings to save
   SaveOption[0] := mAlEffectiveMovesOnly.Tag;
   SaveOption[1] := mEnMoves.Tag;
@@ -3397 +3407 @@
 
   Reg := TRegistry.Create;
-  doinit := true;
-  if Reg.KeyExists('SOFTWARE\cevo\RegVer9') then
-    with Reg do
-    begin
-      doinit := false;
-      OpenKey('SOFTWARE\cevo\RegVer9', false);
-      if ValueExists('TileWidth') then
-        xxt := ReadInteger('TileWidth') div 2
-      else
-        xxt := 48;
-      if ValueExists('TileHeight') then
-        yyt := ReadInteger('TileHeight') div 2
-      else
-        yyt := 24;
-      if ValueExists('OptionChecked') then
-        OptionChecked := ReadInteger('OptionChecked')
-      else
-        OptionChecked := DefaultOptionChecked;
-      if ValueExists('MapOptionChecked') then
-        MapOptionChecked := ReadInteger('MapOptionChecked')
-      else
-        MapOptionChecked := 1 shl moCityNames;
-      if ValueExists('CityMapMask') then
-        CityRepMask := Cardinal(ReadInteger('CityReport'))
-      else
-        CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
+  with Reg do
+  try
+    OpenKey('SOFTWARE\cevo\RegVer9', false);
+    if ValueExists('TileWidth') then xxt := ReadInteger('TileWidth') div 2
+      else xxt := 48;
+    if ValueExists('TileHeight') then yyt := ReadInteger('TileHeight') div 2
+      else yyt := 24;
+    if ValueExists('OptionChecked') then OptionChecked := ReadInteger('OptionChecked')
+      else OptionChecked := DefaultOptionChecked;
+    if ValueExists('MapOptionChecked') then MapOptionChecked := ReadInteger('MapOptionChecked')
+      else MapOptionChecked := 1 shl moCityNames;
+    if ValueExists('CityReport') then CityRepMask := Cardinal(ReadInteger('CityReport'))
+      else CityRepMask := Cardinal(not chPopIncrease and not chNoGrowthWarning and
           not chCaptured);
-      CloseKey;
-      if OptionChecked and (7 shl 16) = 0 then
-        OptionChecked := OptionChecked or (1 shl 16);
+    CloseKey;
+    if OptionChecked and (7 shl 16) = 0 then
+      OptionChecked := OptionChecked or (1 shl 16);
       // old regver with no scrolling
-    end;
-  Reg.free;
+  finally
+    Free;
+  end;
 
   if FullScreen then
@@ -3444 +3442 @@
   else
     SoundMode := smOn;
-end;
-
-procedure TMainScreen.FormCreate(Sender: TObject);
-var
-  i, j: integer;
-begin
+
   sb := TPVScrollbar.Create;
 {$IFDEF WINDOWS}{ TODO }
@@ -3464 +3457 @@
         for j := 0 to nSaveOption - 1 do
           if Components[i].Tag and $FF = SaveOption[j] then
-            TMenuItem(Components[i]).Checked := 1 shl j and OptionChecked <> 0;
+            TMenuItem(Components[i]).Checked := ((1 shl j) and OptionChecked) <> 0;
       end
       else if Components[i] is TButtonBase then
@@ -7999 +7992 @@
 
   Reg := TRegistry.Create;
-  Reg.OpenKey('SOFTWARE\cevo\RegVer9', true);
-  Reg.WriteInteger('TileWidth', xxt * 2);
-  Reg.WriteInteger('TileHeight', yyt * 2);
-  Reg.WriteInteger('OptionChecked', OptionChecked);
-  Reg.WriteInteger('MapOptionChecked', MapOptionChecked);
-  Reg.WriteInteger('CityReport', integer(CityRepMask));
-  Reg.CloseKey;
-  Reg.free;
+  with Reg do
+  try
+    OpenKey('SOFTWARE\cevo\RegVer9', true);
+    WriteInteger('TileWidth', xxt * 2);
+    WriteInteger('TileHeight', yyt * 2);
+    WriteInteger('OptionChecked', OptionChecked);
+    WriteInteger('MapOptionChecked', MapOptionChecked);
+    WriteInteger('CityReport', integer(CityRepMask));
+    CloseKey;
+  finally
+    Free;
+  end;
 end;