From 958bd1a1cf7bb86f53b045ffab681ac622cbed55 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Tue, 24 Oct 2023 18:26:39 +0200
Subject: [PATCH] Prioritize .wav and .ogg files over shipped .idwav files

---
 neo/sound/XAudio2/XA2_SoundSample.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/neo/sound/XAudio2/XA2_SoundSample.cpp b/neo/sound/XAudio2/XA2_SoundSample.cpp
index 8610f8e0..f63ef05c 100644
--- a/neo/sound/XAudio2/XA2_SoundSample.cpp
+++ b/neo/sound/XAudio2/XA2_SoundSample.cpp
@@ -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" ) )