Changeset 72 for trunk


Ignore:
Timestamp:
Jan 11, 2023, 5:18:36 PM (2 years ago)
Author:
chronos
Message:
  • Fixed: Background in main menu was not correctly cleared.
  • Fixed: Windows installer script to support InnoSetup 6.
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Install/win/Tunneler.iss

    r40 r72  
    33
    44#define MyAppName "Tunneler"
    5 #define MyAppVersion "1.0.0-alfa"
     5#define MyAppNameShort "Tunneler"
     6#define MyAppVersion "1.0.0"
    67#define MyAppPublisher "Chronosoft"
    78#define MyAppPublisherShort "Chronosoft"
     
    910#define MyAppExeName "Tunneler.exe"
    1011#define MyAppDebugName "Tunneler.dbg"
    11 #define MyAppSubDir "..\.."
     12#define MyAppSubDir "../.."
    1213
    1314[Setup]
     
    1819AppName={#MyAppName}
    1920AppVersion={#MyAppVersion}
    20 ;AppVerName={#MyAppName} {#MyAppVersion}
     21AppVerName={#MyAppName} {#MyAppVersion}
    2122AppPublisher={#MyAppPublisher}
    2223AppPublisherURL={#MyAppURL}
    2324AppSupportURL={#MyAppURL}
    2425AppUpdatesURL={#MyAppURL}
    25 DefaultDirName={pf}\{#MyAppPublisherShort}\{#MyAppName}
     26UninstallDisplayName={#MyAppName}
     27UninstallDisplayIcon="{app}\{#MyAppExeName}"
     28VersionInfoVersion={#MyAppVersion}
     29VersionInfoCompany={#MyAppPublisher}
     30DefaultDirName={commonpf}\{#MyAppPublisherShort}\{#MyAppName}
    2631DefaultGroupName={#MyAppPublisherShort}\{#MyAppName}
    2732AllowNoIcons=yes
    2833OutputDir=.
    29 OutputBaseFilename=Install-{#MyAppName}-{#MyAppVersion}
     34OutputBaseFilename=Install-{#MyAppNameShort}-{#MyAppVersion}
    3035Compression=lzma
    3136SolidCompression=yes
     
    3944; installation to run on all architectures (including Itanium,
    4045; since it's capable of running 32-bit code too).
     46WizardStyle=modern
    4147
    4248[Languages]
     
    4854
    4955[Registry]
    50 Root: HKCU; Subkey: "Software\Chronosoft\Tunneler"; Flags: uninsdeletekey
     56Root: HKLM; Subkey: "Software\Chronosoft\Tunneler"; Flags: uninsdeletekey
    5157
    5258[Files]
     
    5460Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
    5561Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion
    56 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
     62Source: "{#MyAppSubDir}\Languages\*.pot"; DestDir: "{app}\Languages"; Flags: ignoreversion
    5763
    5864[Icons]
  • trunk/Install/win/build.bat

    r40 r72  
    1818copy %MAIN_EXE% %WIN64_EXE%
    1919
    20 "c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "%PROJECTNAME%.iss"
     20"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%PROJECTNAME%.iss"
  • trunk/UEngine.pas

    r71 r72  
    219219    procedure SetActive(const AValue: Boolean);
    220220    procedure SetBitmap(const AValue: TBitmap);
    221     procedure Redraw;
    222221    function IsInsideHouses(Pos: TPoint): Boolean;
    223222    procedure InitPlayers;
    224223    procedure CheckGameEnd;
     224    procedure ClearBackground;
    225225    procedure DrawMenu;
    226226    procedure DrawStats;
     
    250250    procedure ResizePlayerFrames;
    251251    procedure Tick;
     252    procedure Redraw;
    252253    procedure Draw;
    253254    procedure DrawThread(Thread: TVirtualThread);
     
    12111212begin
    12121213  with Bitmap.Canvas do begin
    1213     Brush.Style := bsSolid;
    1214     Brush.Color := clBlack;
    1215     Clear;
     1214    ClearBackground;
    12161215
    12171216    X := Bitmap.Width div 2;
     
    12571256begin
    12581257  with Bitmap.Canvas do begin
    1259     Brush.Style := bsSolid;
    1260     Brush.Color := clBlack;
    1261     Clear;
     1258    ClearBackground;
    12621259
    12631260    X := Bitmap.Width div 2;
     
    13081305begin
    13091306  with Bitmap.Canvas do begin
    1310     Brush.Style := bsSolid;
    1311     Brush.Color := clBlack;
    1312     Clear;
     1307    ClearBackground;
    13131308
    13141309    Brush.Style := bsClear;
     
    16071602end;
    16081603
    1609 procedure TEngine.DrawMenu;
    1610 var
    1611   Text: string;
    1612   MenuWidth: Integer;
     1604procedure TEngine.ClearBackground;
    16131605begin
    16141606  with Bitmap.Canvas do begin
    16151607    Brush.Style := bsSolid;
    16161608    Brush.Color := clBlack;
    1617     Clear;
     1609    FillRect(0, 0, Bitmap.Width, Bitmap.Height);
     1610  end;
     1611end;
     1612
     1613procedure TEngine.DrawMenu;
     1614var
     1615  Text: string;
     1616  MenuWidth: Integer;
     1617begin
     1618  with Bitmap.Canvas do begin
     1619    ClearBackground;
    16181620
    16191621    if FShowMenuStats then begin
Note: See TracChangeset for help on using the changeset viewer.