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 ba6343a9d6ddefe2673d69b12a898ebb2e907c1f..54eee3193b09c8abdc4066cecf130ff36524e994 100644 (file)
--- 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 f010ece68947efd412e6b94f1051a907a8f55b01..2a531c17ac69c6763d6ffd197cb9fb43a7d03cc5 100644 (file)
--- 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 26c916accaf940dd79c2576de7cb40c9b82d5970..03a9615f918dec6040cc0e0bac5e55cdac2b400c 100644 (file)
--- 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);