client: improved sound warnings, refs #5

etlegacy · Jan 30, 2013 · ba2c352 · ba2c352
1 parent 5fe6056
commit ba2c352
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/client/snd_dma.c b/src/client/snd_dma.c
@@ -283,18 +283,18 @@ static sfx_t *S_FindName(const char *name)
 
 	if (!name)
 	{
-		Com_DPrintf(S_COLOR_RED "ERROR S_FindName: NULL\n");
+		Com_DPrintf(S_COLOR_RED "ERROR: [S_FindName] NULL\n");
 		return NULL;
 	}
 	if (!name[0])
 	{
-		Com_DPrintf(S_COLOR_RED "ERROR S_FindName: empty name\n");
+		Com_DPrintf(S_COLOR_RED "ERROR: [S_FindName] empty name\n");
 		return NULL;
 	}
 
 	if (strlen(name) >= MAX_QPATH)
 	{
-		Com_DPrintf(S_COLOR_RED "ERROR S_FindName: Sound name too long: %s", name);
+		Com_DPrintf(S_COLOR_RED "ERROR: [S_FindName] Sound name too long: %s", name);
 		return NULL;
 	}
 
@@ -420,7 +420,7 @@ sfxHandle_t S_Base_RegisterSound(const char *name, qboolean compressed)
 
 	if (strlen(name) >= MAX_QPATH)
 	{
-		Com_Printf("S_Base_RegisterSound: Sound name exceeds MAX_QPATH\n");
+		Com_DPrintf(S_COLOR_RED "ERROR: [S_Base_RegisterSound] Sound name exceeds MAX_QPATH\n");
 		return 0;
 	}
 
@@ -434,7 +434,7 @@ sfxHandle_t S_Base_RegisterSound(const char *name, qboolean compressed)
 	{
 		if (sfx->defaultSound)
 		{
-			Com_DPrintf(S_COLOR_YELLOW "WARNING S_Base_RegisterSound: could not find %s - using default\n", sfx->soundName);
+			Com_DPrintf(S_COLOR_YELLOW "WARNING: [S_Base_RegisterSound]: could not find %s - using default\n", sfx->soundName);
 			return 0;
 		}
 		return sfx - knownSfx;
@@ -447,7 +447,7 @@ sfxHandle_t S_Base_RegisterSound(const char *name, qboolean compressed)
 
 	if (sfx->defaultSound)
 	{
-		Com_DPrintf(S_COLOR_YELLOW "WARNING S_Base_RegisterSound: could not find %s - using default\n", sfx->soundName);
+		Com_DPrintf(S_COLOR_YELLOW "WARNING: [S_Base_RegisterSound] could not find %s - using default\n", sfx->soundName);
 		return 0;
 	}
 
@@ -481,7 +481,6 @@ void S_memoryLoad(sfx_t *sfx)
 	// load the sound file
 	if (!S_LoadSound(sfx))
 	{
-		//Com_Printf( S_COLOR_YELLOW "WARNING: couldn't load sound: %s\n", sfx->soundName );
 		sfx->defaultSound = qtrue;
 	}
 	sfx->inMemory = qtrue;

diff --git a/src/client/snd_mem.c b/src/client/snd_mem.c
@@ -216,6 +216,12 @@ qboolean S_LoadSound(sfx_t *sfx)
 		return qfalse;
 	}
 
+	if (!FS_FOpenFileRead(sfx->soundName, NULL, qfalse))
+	{
+		Com_DPrintf(S_COLOR_RED "ERROR: sound file \"%s\" does not exist\n", sfx->soundName);
+		return qfalse;
+	}
+
 	// load it in
 	data = S_CodecLoad(sfx->soundName, &info);
 	if (!data)
@@ -228,9 +234,9 @@ qboolean S_LoadSound(sfx_t *sfx)
 		Com_DPrintf(S_COLOR_YELLOW "WARNING: %s is a 8 bit wav file\n", sfx->soundName);
 	}
 
-	if (info.rate != 22050)
+	if ((info.rate != 11025) && (info.rate != 22050) && (info.rate != 44100))
 	{
-		Com_DPrintf(S_COLOR_YELLOW "WARNING: %s is not a 22kHz wav file\n", sfx->soundName);
+		Com_DPrintf(S_COLOR_YELLOW "WARNING: %s is not a 11kHz, 22kHz nor 44kHz wav file. It has sample rate %i\n", sfx->soundName, info.rate);
 	}
 
 	samples = Hunk_AllocateTempMemory(info.samples * sizeof(short) * 2);

diff --git a/src/client/snd_openal.c b/src/client/snd_openal.c
@@ -288,7 +288,7 @@ static void S_AL_BufferUseDefault(sfxHandle_t sfx)
 		Com_Error(ERR_FATAL, "Can't load default sound effect %s\n", knownSfx[sfx].filename);
 	}
 
-	Com_Printf(S_COLOR_YELLOW "WARNING S_AL_BufferUseDefault: Using default sound for %s\n", knownSfx[sfx].filename);
+	Com_Printf(S_COLOR_YELLOW "WARNING: [S_AL_BufferUseDefault] Using default sound for %s\n", knownSfx[sfx].filename);
 	knownSfx[sfx].isDefault = qtrue;
 	knownSfx[sfx].buffer    = knownSfx[default_sfx].buffer;
 }