index a3d3fe15c415323c647e899b4f695c81f443f369..eaba574aa61e2d71e0f8621e5f3b0842d3442301 100644 (file)
implementation
uses
- BinEditor, WADEDITOR, e_log, f_main, g_language, g_resources
+ BinEditor, WADEDITOR, e_log, f_main, g_language
{$IFNDEF NOSOUND}, fmod, fmodtypes, fmoderrors;{$ELSE};{$ENDIF}
{$R *.lfm}
function TAddSoundForm.CreateSoundWAD(Resource: String): Boolean;
var
+ WAD: TWADEditor_1;
FileName, SectionName, ResourceName: String;
ResLength: Integer;
sz: LongWord;
{$IFNDEF NOSOUND}
g_ProcessResourceStr(Resource, FileName, SectionName, ResourceName);
- g_ReadResource(FileName, SectionName, ResourceName, SoundData, ResLength);
- if SoundData <> nil then
+ WAD := TWADEditor_1.Create;
+ WAD.ReadFile(FileName);
+
+ if WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), SoundData, ResLength) then
begin
sz := SizeOf(FMOD_CREATESOUNDEXINFO);
FillMemory(@soundExInfo, sz, 0);
begin
e_WriteLog(Format('Error creating sound %s', [Resource]), MSG_WARNING);
e_WriteLog(FMOD_ErrorString(res), MSG_WARNING);
+ WAD.Free();
Exit;
end;
end
else
begin
e_WriteLog(Format('Error loading sound %s', [Resource]), MSG_WARNING);
- //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+ WAD.Free();
Exit;
end;
+ WAD.Free();
Result := True;
{$ENDIF}
end;