Changeset 95 for trunk/Engine.pas

Timestamp:

May 19, 2024, 6:15:22 PM (4 months ago)

Author:

chronos

Message:

• Fixed: Hide main menu with Qt5 widgetset.
• Fixed: Pack audio files and detect alternative Unix location.

File:

• trunk/Engine.pas (modified) (3 diffs)

trunk/Engine.pas

@@ -250 +250 @@
     function TextOutWordWrap(Canvas: TCanvas; X, Y: Integer; Text: string; Width: Integer): Integer;
     function GetMenuWidth: Integer;
+    function GetAudioDir: string;
   public
     ThreadErrorMessage: string;
@@ -1641 +1642 @@
 end;
 
+function TEngine.GetAudioDir: string;
+{$IFDEF UNIX}
+const
+  UnixDataDir = '/usr/share/Tunneler';
+  UnixAudioDir = UnixDataDir + '/Audio';
+{$ENDIF}
+begin
+  Result := GetCurrentDir + DirectorySeparator + 'Audio';
+  {$IFDEF UNIX}
+  if not DirectoryExists(Result) and DirectoryExists(UnixAudioDir) then begin
+    Result := UnixAudioDir;
+    Exit;
+  end;
+  {$ENDIF}
+end;
+
 function TEngine.Scale(Value: Integer): Integer;
 begin
@@ -2120 +2137 @@
   //DefaultAudioSystem := TAudioSystemMPlayer.Create(nil);
   AudioShot := TSound.Create(nil);
-  AudioShot.FileName := GetCurrentDir + '/Audio/GE_KF7_Soviet.wav';
+  AudioShot.FileName := GetAudioDir + DirectorySeparator + 'GE_KF7_Soviet.wav';
   AudioExplode := TSound.Create(nil);
-  AudioExplode.FileName := GetCurrentDir + '/Audio/bomb.wav';
+  AudioExplode.FileName := GetAudioDir + DirectorySeparator + 'bomb.wav';
   InitPlayerPool;
   DigMasks := TObjectList<TMatrixByte>.Create;