From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 17 Jul 2007 06:09:46 +0000 (+0000)
Subject: changed SCR_BeginLoadingPlaque to not call S_StopAllSounds, this should
X-Git-Tag: xonotic-v0.1.0preview~2974
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f8466893a06854bfc7ebc12cf97cec393c66175e;p=xonotic%2Fdarkplaces.git

changed SCR_BeginLoadingPlaque to not call S_StopAllSounds, this should
fix cd loop/play commands in quake.rc


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7491 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_parse.c b/cl_parse.c
index ba6343a9..54eee319 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -1396,7 +1396,10 @@ void CL_ParseServerInfo (void)
 
 	// if server is active, we already began a loading plaque
 	if (!sv.active)
+	{
 		SCR_BeginLoadingPlaque();
+		S_StopAllSounds();
+	}
 
 	// check memory integrity
 	Mem_CheckSentinelsGlobal();
diff --git a/cl_screen.c b/cl_screen.c
index f010ece6..2a531c17 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -600,7 +600,6 @@ void SCR_BeginLoadingPlaque (void)
 	Log_Start();
 
 	Host_StartVideo();
-	S_StopAllSounds();
 	SCR_UpdateLoadingScreen(false);
 }
 
diff --git a/sv_main.c b/sv_main.c
index 26c916ac..03a9615f 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -2266,7 +2266,10 @@ void SV_SpawnServer (const char *server)
 	Con_DPrintf("SpawnServer: %s\n", server);
 
 	if (cls.state != ca_dedicated)
+	{
 		SCR_BeginLoadingPlaque();
+		S_StopAllSounds();
+	}
 
 	dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server);
 	worldmodel = Mod_ForName(modelname, false, true, true);