[Shared] fix s_initSound 0 crash

Author: Razish

code/client/snd_ambient.cpp

@@ -788,10 +788,8 @@ AS_AddPrecacheEntry
 -------------------------
 */
 
-void AS_AddPrecacheEntry( const char *name )
-{
-	if (!pMap)	//s_initsound 0 probably
-	{
+void AS_AddPrecacheEntry( const char *name ) {
+	if ( !pMap ) { // s_initsound 0 probably
 		return;
 	}
 	if (!Q_stricmp(name,"#clear"))
@@ -816,10 +814,10 @@ Called on the client side to load and precache all the ambient sound sets
 
 void AS_ParseSets( void )
 {
-	cvar_t	*cv = Cvar_Get ("s_initsound", "1", 0);
-	if ( !cv->integer ) {
+	if ( !s_initsound->integer ) {
 		return;
 	}
+
 	AS_Init();
 
 	//Parse all the sets
@@ -913,47 +911,47 @@ Fades volumes up or down depending on the action being taken on them.
 -------------------------
 */
 
-static void AS_UpdateSetVolumes( void )
-{
-	ambientSet_t	*old, *current;
-	float			scale;
-	int				deltaTime;
+static void AS_UpdateSetVolumes( void ) {
+	if ( !aSets ) {
+		return;
+	}
 
 	//Get the sets and validate them
-	current = aSets->GetSet( currentSet );
-
-	if ( current == NULL )
+	ambientSet_t *current = aSets->GetSet( currentSet );
+	if ( !current ) {
 		return;
+	}
 
-	if ( current->masterVolume < MAX_SET_VOLUME )
-	{
+	float scale;
+	int deltaTime;
+	if ( current->masterVolume < MAX_SET_VOLUME ) {
 		deltaTime = cls.realtime - current->fadeTime;
 		scale = ((float)(deltaTime)/(float)(crossDelay));
 		current->masterVolume = (int)((scale) * (float)MAX_SET_VOLUME);
 	}
 
-	if ( current->masterVolume > MAX_SET_VOLUME )
+	if ( current->masterVolume > MAX_SET_VOLUME ) {
 		current->masterVolume = MAX_SET_VOLUME;
+	}
 
 	//Only update the old set if it's still valid
-	if ( oldSet == -1 )
+	if ( oldSet == -1 ) {
 		return;
+	}
 
-	old = aSets->GetSet( oldSet );
-
-	if ( old == NULL )
+	ambientSet_t *old = aSets->GetSet( oldSet );
+	if ( !old ) {
 		return;
+	}
 
 	//Update the volumes
-	if ( old->masterVolume > 0 )
-	{
+	if ( old->masterVolume > 0 ) {
 		deltaTime = cls.realtime - old->fadeTime;
 		scale = ((float)(deltaTime)/(float)(crossDelay));
 		old->masterVolume = MAX_SET_VOLUME - (int)((scale) * (float)MAX_SET_VOLUME);
 	}
 
-	if ( old->masterVolume <= 0 )
-	{
+	if ( old->masterVolume <= 0 ) {
 		old->masterVolume = 0;
 		oldSet = -1;
 	}
@@ -967,26 +965,25 @@ Does internal maintenance to keep track of changing sets.
 -------------------------
 */
 
-static void AS_UpdateCurrentSet( int id )
-{
-	ambientSet_t	*old, *current;
+static void AS_UpdateCurrentSet( int id ) {
+	if ( !aSets ) {
+		return;
+	}
 
 	//Check for a change
-	if ( id != currentSet )
-	{
+	if ( id != currentSet ) {
 		//This is new, so start the fading
 		oldSet = currentSet;
 		currentSet = id;
 
-		old = aSets->GetSet( oldSet );
-		current = aSets->GetSet( currentSet );
+		ambientSet_t *current = aSets->GetSet( currentSet );
 		// Ste, I just put this null check in for now, not sure if there's a more graceful way to exit this function - dmv
-		if( !current )
-		{
+		if ( !current ) {
 			return;
 		}
-		if ( old )
-		{
+
+		ambientSet_t *old = aSets->GetSet( oldSet );
+		if ( old ) {
 			old->masterVolume = MAX_SET_VOLUME;
 			old->fadeTime = cls.realtime;
 		}
@@ -1010,42 +1007,42 @@ Alters lastTime to reflect the time updates.
 -------------------------
 */
 
-static void AS_PlayLocalSet( vec3_t listener_origin, vec3_t origin, ambientSet_t *set, int entID, int *lastTime )
-{
-	unsigned char	volume;
-	vec3_t			dir;
-	float			volScale, dist, distScale;
-	int				time = cl.serverTime;
-
+static void AS_PlayLocalSet( vec3_t listener_origin, vec3_t origin, const ambientSet_t *set, int entID, int *lastTime ) {
 	//Make sure it's valid
-	if ( set == NULL )
+	if ( !set ) {
 		return;
+	}
 
+	vec3_t dir;
 	VectorSubtract( origin, listener_origin, dir );
-	dist = VectorLength( dir );
+	float dist = VectorLength( dir );
 
 	//Determine the volume based on distance (NOTE: This sits on top of what SpatializeOrigin does)
-	distScale	= ( dist < ( set->radius * 0.5f ) ) ? 1 : ( set->radius - dist ) / ( set->radius * 0.5f );
-	volume		= ( distScale > 1.0f || distScale < 0.0f ) ? 0 : (unsigned char) ( set->masterVolume * distScale );
+	float distScale = ( dist < ( set->radius * 0.5f ) ) ? 1 : ( set->radius - dist ) / ( set->radius * 0.5f );
+	unsigned char volume = ( distScale > 1.0f || distScale < 0.0f ) ? 0 : (unsigned char) ( set->masterVolume * distScale );
 
 	//Add the looping sound
-	if ( set->loopedWave )
+	if ( set->loopedWave ) {
 		S_AddAmbientLoopingSound( origin, volume, set->loopedWave );
+	}
 
 	//Check the time to start another one-shot subwave
-	if ( ( time - *lastTime ) < ( ( Q_irand( set->time_start, set->time_end ) ) * 1000 ) )
+	int time = cl.serverTime;
+	if ( ( time - *lastTime ) < ( ( Q_irand( set->time_start, set->time_end ) ) * 1000 ) ) {
 		return;
+	}
 
 	//Update the time
 	*lastTime = time;
 
 	//Scale the volume ranges for the subwaves based on the overall master volume
-	volScale = (float) volume / (float) MAX_SET_VOLUME;
+	float volScale = (float) volume / (float) MAX_SET_VOLUME;
 	volume = (unsigned char) Q_irand( (int)(volScale*set->volRange_start), (int)(volScale*set->volRange_end) );
 
 	//Add the random subwave
-	if ( set->numSubWaves )
+	if ( set->numSubWaves ) {
 		S_StartAmbientSound( origin, entID, volume, set->subWaves[Q_irand( 0, set->numSubWaves-1)] );
+	}
 }
 
 /*
@@ -1057,38 +1054,39 @@ Alters lastTime to reflect the time updates.
 -------------------------
 */
 
-static void AS_PlayAmbientSet( vec3_t origin, ambientSet_t *set, int *lastTime )
-{
-	unsigned char	volume;
-	float			volScale;
-	int				time = cls.realtime;
-
+static void AS_PlayAmbientSet( vec3_t origin, const ambientSet_t *set, int *lastTime ) {
 	//Make sure it's valid
-	if ( set == NULL )
+	if ( !set ) {
 		return;
+	}
 
 	//Add the looping sound
-	if ( set->loopedWave )
+	if ( set->loopedWave ) {
 		S_AddAmbientLoopingSound( origin, (unsigned char) set->masterVolume, set->loopedWave );
+	}
 
 	//Check the time to start another one-shot subwave
-	if ( ( time - *lastTime ) < ( ( Q_irand( set->time_start, set->time_end ) ) * 1000 ) )
+	int time = cls.realtime;
+	if ( ( time - *lastTime ) < ( ( Q_irand( set->time_start, set->time_end ) ) * 1000 ) ) {
 		return;
+	}
 
 	//Update the time
 	*lastTime = time;
 
 	//Scale the volume ranges for the subwaves based on the overall master volume
-	volScale = (float) set->masterVolume / (float) MAX_SET_VOLUME;
-	volume = Q_irand( (int)(volScale*set->volRange_start), (int)(volScale*set->volRange_end) );
+	float volScale = (float) set->masterVolume / (float) MAX_SET_VOLUME;
+	unsigned char volume = Q_irand( (int)(volScale*set->volRange_start), (int)(volScale*set->volRange_end) );
 
 	//Allow for softer noises than the masterVolume, but not louder
-	if ( volume > set->masterVolume )
+	if ( volume > set->masterVolume ) {
 		volume = set->masterVolume;
+	}
 
 	//Add the random subwave
-	if ( set->numSubWaves )
+	if ( set->numSubWaves ) {
 		S_StartAmbientSound( origin, 0, volume, set->subWaves[Q_irand( 0, set->numSubWaves-1)] );
+	}
 }
 
 /*
@@ -1099,29 +1097,28 @@ Does maintenance and plays the ambient sets (two if crossfading)
 -------------------------
 */
 
-void S_UpdateAmbientSet ( const char *name, vec3_t origin )
-{
-	ambientSet_t	*current, *old;
-	if (aSets == NULL)
-	{
+void S_UpdateAmbientSet( const char *name, vec3_t origin ) {
+	if ( !aSets ) {
 		return;
 	}
-	ambientSet_t	*set = aSets->GetSet( name );
 
-	if ( set == NULL )
+	const ambientSet_t *set = aSets->GetSet( name );
+	if ( !set ) {
 		return;
+	}
 
 	//Update the current and old set for crossfading
 	AS_UpdateCurrentSet( set->id );
 
-	current = aSets->GetSet( currentSet );
-	old = aSets->GetSet( oldSet );
-
-	if ( current )
+	const ambientSet_t *current = aSets->GetSet( currentSet );
+	if ( current ) {
 		AS_PlayAmbientSet( origin, set, &currentSetTime );
+	}
 
-	if ( old )
+	const ambientSet_t *old = aSets->GetSet( oldSet );
+	if ( old ) {
 		AS_PlayAmbientSet( origin, old, &oldSetTime );
+	}
 }
 
 /*
@@ -1130,20 +1127,18 @@ S_AddLocalSet
 -------------------------
 */
 
-int S_AddLocalSet( const char *name, vec3_t listener_origin, vec3_t origin, int entID, int time )
-{
-	ambientSet_t	*set;
-	int				currentTime = 0;
-
-	set = aSets->GetSet( name );
-
-	if ( set == NULL )
+int S_AddLocalSet( const char *name, vec3_t listener_origin, vec3_t origin, int entID, int time ) {
+	if ( !aSets ) {
 		return cl.serverTime;
+	}
 
-	currentTime = time;
+	const ambientSet_t *set = aSets->GetSet( name );
+	if ( !set ) {
+		return cl.serverTime;
+	}
 
+	int currentTime = time;
 	AS_PlayLocalSet( listener_origin, origin, set, entID, &currentTime );
-
 	return currentTime;
 }
 
@@ -1153,18 +1148,16 @@ AS_GetBModelSound
 -------------------------
 */
 
-sfxHandle_t AS_GetBModelSound( const char *name, int stage )
-{
-	ambientSet_t	*set;
-
-	set = aSets->GetSet( name );
-
-	if ( set == NULL )
+sfxHandle_t AS_GetBModelSound( const char *name, int stage ) {
+	if ( !aSets ) {
 		return -1;
+	}
 
 	//Stage must be within a valid range
-	if ( ( stage > ( set->numSubWaves - 1 ) ) || ( stage < 0 ) )
+	const ambientSet_t *set = aSets->GetSet( name );
+	if ( !set || stage < 0 || stage > (set->numSubWaves - 1) ) {
 		return -1;
+	}
 
-	return set->subWaves[ stage ];
+	return set->subWaves[stage];
 }