id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-19 08:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prioritize .wav and .ogg files over shipped .idwav files

Browse source
This commit is contained in:
Robert Beckebans 2023-10-24 18:26:39 +02:00
parent cd03d01e85
commit 958bd1a1cf
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
neo/sound/XAudio2/XA2_SoundSample.cpp
View file

@ -200,6 +200,13 @@ void idSoundSample_XAudio2::LoadResource()
return;
}
#if 0
if( idStr::FindText( GetName(), "marine1_sitting_1_1", 8 ) > -1 )
{
loaded = false;
}
#endif
loaded = false;
for( int i = 0; i < 2; i++ )
@ -223,8 +230,9 @@ void idSoundSample_XAudio2::LoadResource()
}
generatedName.Append( ".idwav" );
}
loaded = LoadGeneratedSample( generatedName ) || LoadWav( sampleName );
// try .wav and .ogg first
loaded = LoadWav( sampleName );
if( !loaded && s_useCompression.GetBool() )
{
sampleName.SetFileExtension( "wav" );
@ -237,6 +245,11 @@ void idSoundSample_XAudio2::LoadResource()
loaded = LoadOgg( sampleName );
}
if( !loaded )
{
loaded = LoadGeneratedSample( generatedName );
}
if( loaded )
{
if( cvarSystem->GetCVarBool( "fs_buildresources" ) )