From eb2860f756675df03bb9606fc5d2460a22e9b245 Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Sun, 29 Aug 2010 18:11:15 +0000
Subject: [PATCH] Fix "unhandles OpenAL error", and sound fallback behaviour
 for model files. Thanks Ansa89 for reporting, and Zack Middleton for the
 patch.

---
 code/client/snd_openal.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c
index b6359890..1e8be0df 100644
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@@ -127,6 +127,7 @@ typedef struct alSfx_s
 	snd_info_t	info;					// information for this sound like rate, sample count..
 
 	qboolean	isDefault;				// Couldn't be loaded - use default FX
+	qboolean	isDefaultChecked;		// Sound has been check if it isDefault
 	qboolean	inMemory;				// Sound is stored in memory
 	qboolean	isLocked;				// Sound is locked (can not be unloaded)
 	int				lastUsedTime;		// Time last used
@@ -291,7 +292,7 @@ static qboolean S_AL_BufferEvict( void )
 S_AL_BufferLoad
 =================
 */
-static void S_AL_BufferLoad(sfxHandle_t sfx)
+static void S_AL_BufferLoad(sfxHandle_t sfx, qboolean cache)
 {
 	ALenum error;
 	ALuint format;
@@ -309,7 +310,7 @@ static void S_AL_BufferLoad(sfxHandle_t sfx)
 		return;
 
 	// Already done?
-	if((curSfx->inMemory) || (curSfx->isDefault))
+	if((curSfx->inMemory) || (curSfx->isDefault) || (!cache && curSfx->isDefaultChecked))
 		return;
 
 	// Try to load
@@ -320,6 +321,15 @@ static void S_AL_BufferLoad(sfxHandle_t sfx)
 		return;
 	}
 
+	curSfx->isDefaultChecked = qtrue;
+
+	if (!cache)
+	{
+		// Don't create AL cache
+		Z_Free(data);
+		return;
+	}
+
 	format = S_AL_Format(info.width, info.channels);
 
 	// Create a buffer
@@ -394,7 +404,7 @@ void S_AL_BufferUse(sfxHandle_t sfx)
 		return;
 
 	if((!knownSfx[sfx].inMemory) && (!knownSfx[sfx].isDefault))
-		S_AL_BufferLoad(sfx);
+		S_AL_BufferLoad(sfx, qtrue);
 	knownSfx[sfx].lastUsedTime = Sys_Milliseconds();
 }
 
@@ -460,10 +470,14 @@ sfxHandle_t S_AL_RegisterSound( const char *sample, qboolean compressed )
 {
 	sfxHandle_t sfx = S_AL_BufferFind(sample);
 
-	if( s_alPrecache->integer && (!knownSfx[sfx].inMemory) && (!knownSfx[sfx].isDefault))
-		S_AL_BufferLoad(sfx);
+	if((!knownSfx[sfx].inMemory) && (!knownSfx[sfx].isDefault))
+		S_AL_BufferLoad(sfx, s_alPrecache->integer);
 	knownSfx[sfx].lastUsedTime = Com_Milliseconds();
 
+	if (knownSfx[sfx].isDefault) {
+		return 0;
+	}
+
 	return sfx;
 }