diff --git a/src/game/g_sound.pas b/src/game/g_sound.pas
index 55098850892c9b9e40c9079296181f58d87fea12..48c5167e007b40eea32a13512ee948509a67c847 100644 (file)
--- a/src/game/g_sound.pas
+++ b/src/game/g_sound.pas
implementation
uses
- e_log, SysUtils, g_console, g_options, WADEDITOR,
+ e_log, SysUtils, g_console, g_options, wadreader,
g_game, g_basic, g_items, g_map, Math,
g_language;
function g_Sound_CreateWAD(var ID: DWORD; Resource: string; isMusic: Boolean = False): Boolean;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
FileName,
SectionName,
ResourceName: string;
// e_WriteLog('Loading sound: ' + Resource, MSG_NOTIFY);
g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
WAD.ReadFile(FileName);
if WAD.GetResource(SectionName, ResourceName, SoundData, ResLength) then
FreeMem(SoundData);
end
else
- e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ begin
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ end;
WAD.Free();
-
- if not ok then
+ if (not ok) then
begin
+{$IFNDEF HEADLESS}
if isMusic then
e_WriteLog(Format('Error loading music %s', [Resource]), MSG_WARNING)
else
e_WriteLog(Format('Error loading sound %s', [Resource]), MSG_WARNING);
Exit;
+{$ENDIF}
end;
-
Result := True;
end;
function g_Sound_CreateWADEx(SoundName: ShortString; Resource: string; isMusic: Boolean = False): Boolean;
var
- WAD: TWADEditor_1;
+ WAD: TWADFile;
FileName, SectionName, ResourceName: string;
SoundData: Pointer;
ResLength: Integer;
find_id := FindSound();
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
WAD.ReadFile(FileName);
if WAD.GetResource(SectionName, ResourceName, SoundData, ResLength) then
FreeMem(SoundData);
end
else
- e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ begin
+ //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ end;
WAD.Free();
-
- if not ok then
+ if (not ok) then
begin
+{$IFNDEF HEADLESS}
if isMusic then
e_WriteLog(Format('Error loading music %s', [Resource]), MSG_WARNING)
else
e_WriteLog(Format('Error loading sound %s', [Resource]), MSG_WARNING);
Exit;
+{$ENDIF}
end;
-
Result := True;
end;