Changeset 72 for trunk

Timestamp:

Jan 11, 2023, 5:18:36 PM (22 months ago)

Author:

chronos

Message:

• Fixed: Background in main menu was not correctly cleared.
• Fixed: Windows installer script to support InnoSetup 6.

Location:

trunk

Files:

• Install/win/Tunneler.iss (modified) (6 diffs)
• Install/win/build.bat (modified) (1 diff)
• UEngine.pas (modified) (6 diffs)

trunk/Install/win/Tunneler.iss

@@ -3 +3 @@
 
 #define MyAppName "Tunneler"
-#define MyAppVersion "1.0.0-alfa"
+#define MyAppNameShort "Tunneler"
+#define MyAppVersion "1.0.0"
 #define MyAppPublisher "Chronosoft"
 #define MyAppPublisherShort "Chronosoft"
@@ -9 +10 @@
 #define MyAppExeName "Tunneler.exe"
 #define MyAppDebugName "Tunneler.dbg"
-#define MyAppSubDir "..\.."
+#define MyAppSubDir "../.."
 
 [Setup]
@@ -18 +19 @@
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppPublisherShort}\{#MyAppName}
+UninstallDisplayName={#MyAppName}
+UninstallDisplayIcon="{app}\{#MyAppExeName}"
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+DefaultDirName={commonpf}\{#MyAppPublisherShort}\{#MyAppName}
 DefaultGroupName={#MyAppPublisherShort}\{#MyAppName}
 AllowNoIcons=yes
 OutputDir=.
-OutputBaseFilename=Install-{#MyAppName}-{#MyAppVersion}
+OutputBaseFilename=Install-{#MyAppNameShort}-{#MyAppVersion}
 Compression=lzma
 SolidCompression=yes
@@ -39 +44 @@
 ; installation to run on all architectures (including Itanium,
 ; since it's capable of running 32-bit code too).
+WizardStyle=modern
 
 [Languages]
@@ -48 +54 @@
 
 [Registry]
-Root: HKCU; Subkey: "Software\Chronosoft\Tunneler"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Chronosoft\Tunneler"; Flags: uninsdeletekey
 
 [Files]
@@ -54 +60 @@
 Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+Source: "{#MyAppSubDir}\Languages\*.pot"; DestDir: "{app}\Languages"; Flags: ignoreversion
 
 [Icons]

trunk/Install/win/build.bat

@@ -18 +18 @@
 copy %MAIN_EXE% %WIN64_EXE%
 
-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "%PROJECTNAME%.iss"
+"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%PROJECTNAME%.iss"

trunk/UEngine.pas

@@ -219 +219 @@
     procedure SetActive(const AValue: Boolean);
     procedure SetBitmap(const AValue: TBitmap);
-    procedure Redraw;
     function IsInsideHouses(Pos: TPoint): Boolean;
     procedure InitPlayers;
     procedure CheckGameEnd;
+    procedure ClearBackground;
     procedure DrawMenu;
     procedure DrawStats;
@@ -250 +250 @@
     procedure ResizePlayerFrames;
     procedure Tick;
+    procedure Redraw;
     procedure Draw;
     procedure DrawThread(Thread: TVirtualThread);
@@ -1211 +1212 @@
 begin
   with Bitmap.Canvas do begin
-    Brush.Style := bsSolid;
-    Brush.Color := clBlack;
-    Clear;
+    ClearBackground;
 
     X := Bitmap.Width div 2;
@@ -1257 +1256 @@
 begin
   with Bitmap.Canvas do begin
-    Brush.Style := bsSolid;
-    Brush.Color := clBlack;
-    Clear;
+    ClearBackground;
 
     X := Bitmap.Width div 2;
@@ -1308 +1305 @@
 begin
   with Bitmap.Canvas do begin
-    Brush.Style := bsSolid;
-    Brush.Color := clBlack;
-    Clear;
+    ClearBackground;
 
     Brush.Style := bsClear;
@@ -1607 +1602 @@
 end;
 
-procedure TEngine.DrawMenu;
-var
-  Text: string;
-  MenuWidth: Integer;
+procedure TEngine.ClearBackground;
 begin
   with Bitmap.Canvas do begin
     Brush.Style := bsSolid;
     Brush.Color := clBlack;
-    Clear;
+    FillRect(0, 0, Bitmap.Width, Bitmap.Height);
+  end;
+end;
+
+procedure TEngine.DrawMenu;
+var
+  Text: string;
+  MenuWidth: Integer;
+begin
+  with Bitmap.Canvas do begin
+    ClearBackground;
 
     if FShowMenuStats then begin