X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_sound.pas;h=5c2882daae9ca8ef2a22e4454bbb6be6ee5870d4;hb=af3c404e11867c6794975f1d45dd98932d804ede;hp=b1e09f8b4d91ee642fac286bf529fb0f32ab88c2;hpb=0968d19494ddf24230a822c02acbe3a3334bc3ad;p=d2df-sdl.git

diff --git a/src/game/g_sound.pas b/src/game/g_sound.pas
index b1e09f8..5c2882d 100644
--- a/src/game/g_sound.pas
+++ b/src/game/g_sound.pas
@@ -1,3 +1,4 @@
+{$MODE DELPHI}
 unit g_sound;
 
 interface
@@ -68,7 +69,7 @@ procedure g_Sound_SetupAllVolumes(SoundVol, MusicVol: Byte);
 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;
 
@@ -279,10 +280,8 @@ end;
 
 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;
@@ -291,12 +290,12 @@ begin
   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);
 
-  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
@@ -309,23 +308,23 @@ begin
   end;
 
   WAD.Free();
-{$IFNDEF HEADLESS}
   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;
-  end;
 {$ENDIF}
+  end;
   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;
@@ -335,14 +334,14 @@ begin
   ok := False;
 
   // e_WriteLog('Loading sound: ' + Resource, MSG_NOTIFY);
-  g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
+  FileName := g_ExtractWadName(Resource);
 
   find_id := FindSound();
 
-  WAD := TWADEditor_1.Create();
+  WAD := TWADFile.Create();
   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
@@ -359,16 +358,16 @@ begin
   end;
 
   WAD.Free();
-{$IFNDEF HEADLESS}
   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;
-  end;
 {$ENDIF}
+  end;
   Result := True;
 end;