diff --git a/src/game/g_sound.pas b/src/game/g_sound.pas
index 55098850892c9b9e40c9079296181f58d87fea12..813d8d145c4edec5cb745d5e83206215d9a17f12 100644 (file)
--- a/src/game/g_sound.pas
+++ b/src/game/g_sound.pas
+(* Copyright (C) DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$MODE DELPHI}
unit g_sound;
interface
unit g_sound;
interface
implementation
uses
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;
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
function g_Sound_CreateWAD(var ID: DWORD; Resource: string; isMusic: Boolean = False): Boolean;
var
- WAD: TWADEditor_1;
- FileName,
- SectionName,
- ResourceName: string;
+ WAD: TWADFile;
+ FileName: string;
SoundData: Pointer;
ResLength: Integer;
ok: Boolean;
SoundData: Pointer;
ResLength: Integer;
ok: Boolean;
ok := False;
// e_WriteLog('Loading sound: ' + Resource, MSG_NOTIFY);
ok := False;
// e_WriteLog('Loading sound: ' + Resource, MSG_NOTIFY);
- g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
+ FileName := g_ExtractWadName(Resource);
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
WAD.ReadFile(FileName);
WAD.ReadFile(FileName);
- if WAD.GetResource(SectionName, ResourceName, SoundData, ResLength) then
+ if WAD.GetResource(g_ExtractFilePathName(Resource), SoundData, ResLength) then
begin
if e_LoadSoundMem(SoundData, ResLength, ID, isMusic) then
ok := True
begin
if e_LoadSoundMem(SoundData, ResLength, ID, isMusic) then
ok := True
FreeMem(SoundData);
end
else
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();
WAD.Free();
-
- if not ok then
+ if (not ok) then
begin
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;
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;
end;
-
Result := True;
end;
function g_Sound_CreateWADEx(SoundName: ShortString; Resource: string; isMusic: Boolean = False): Boolean;
var
Result := True;
end;
function g_Sound_CreateWADEx(SoundName: ShortString; Resource: string; isMusic: Boolean = False): Boolean;
var
- WAD: TWADEditor_1;
- FileName, SectionName, ResourceName: string;
+ WAD: TWADFile;
+ FileName: string;
SoundData: Pointer;
ResLength: Integer;
find_id: DWORD;
SoundData: Pointer;
ResLength: Integer;
find_id: DWORD;
ok := False;
// e_WriteLog('Loading sound: ' + Resource, MSG_NOTIFY);
ok := False;
// e_WriteLog('Loading sound: ' + Resource, MSG_NOTIFY);
- g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
+ FileName := g_ExtractWadName(Resource);
find_id := FindSound();
find_id := FindSound();
- WAD := TWADEditor_1.Create();
+ WAD := TWADFile.Create();
WAD.ReadFile(FileName);
WAD.ReadFile(FileName);
- if WAD.GetResource(SectionName, ResourceName, SoundData, ResLength) then
+ if WAD.GetResource(g_ExtractFilePathName(Resource), SoundData, ResLength) then
begin
if e_LoadSoundMem(SoundData, ResLength, SoundArray[find_id].ID, isMusic) then
begin
begin
if e_LoadSoundMem(SoundData, ResLength, SoundArray[find_id].ID, isMusic) then
begin
FreeMem(SoundData);
end
else
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();
WAD.Free();
-
- if not ok then
+ if (not ok) then
begin
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;
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;
end;
-
Result := True;
end;
Result := True;
end;