add source-sdk-2013

game/shared/SoundEmitterSystem.cpp

@@ -278,7 +278,7 @@ public:
 			V_strncpy( scriptfile, "scripts/mvm_level_sounds.txt", sizeof( scriptfile ) );
 			if ( filesystem->FileExists( "scripts/mvm_level_sounds.txt", "GAME" ) )
 			{
-				soundemitterbase->AddSoundOverrides( "scripts/mvm_level_sounds.txt", true );
+				soundemitterbase->AddSoundOverrides( "scripts/mvm_level_sounds.txt" );
 			}
 			if ( filesystem->FileExists( "scripts/mvm_level_sound_tweaks.txt", "GAME" ) )
 			{
@@ -337,15 +337,6 @@ public:
 		FinishLog();
 #endif
 	}
-
-	void Flush()
-	{
-		Assert( soundemitterbase );
-#if !defined( CLIENT_DLL )
-		FinishLog();
-#endif
-		soundemitterbase->Flush();
-	}
 		
 	void InternalPrecacheWaves( int soundIndex )
 	{
@@ -474,6 +465,7 @@ public:
 		{
 			return;
 		}
+#endif // STAGING_ONLY
 
 		if ( !Q_strncasecmp( params.soundname, "vo", 2 ) &&
 			!( params.channel == CHAN_STREAM ||
@@ -483,7 +475,6 @@ public:
 			DevMsg( "EmitSound:  Voice wave file %s doesn't specify CHAN_VOICE, CHAN_VOICE2 or CHAN_STREAM for sound %s\n",
 				params.soundname, ep.m_pSoundName );
 		}
-#endif // STAGING_ONLY
 
 		// handle SND_CHANGEPITCH/SND_CHANGEVOL and other sound flags.etc.
 		if( ep.m_nFlags & SND_CHANGE_PITCH )
@@ -1007,7 +998,10 @@ void S_SoundEmitterSystemFlush( void )
 
 	// save the current soundscape
 	// kill the system
-	g_SoundEmitterSystem.Flush();
+	g_SoundEmitterSystem.Shutdown();
+
+	// restart the system
+	g_SoundEmitterSystem.Init();
 
 #if !defined( CLIENT_DLL )
 	// Redo precache all wave files... (this should work now that we have dynamic string tables)