make dedicated work again

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

diff --git a/cl_main.c b/cl_main.c
index b5e15010e29ae9a94b42e64e9168ac4427a212e8..5eb8516086d3e1eac30eda68763e042cabba8ce4 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -165,6 +165,9 @@ This is also called on Host_Error, so it shouldn't cause any errors
 */
 void CL_Disconnect (void)
 {
+       if (cls.state == ca_dedicated)
+               return;
+
 // stop sounds (especially looping!)
        S_StopAllSounds (true);
 

diff --git a/host.c b/host.c
index 465c82d81aacb0e4707c789aa131260324c1a1d5..b404789ea93ffd4ac0b5ba13871c6ccbb6bc3d93 100644 (file)
--- a/host.c
+++ b/host.c
@@ -442,8 +442,7 @@ void Host_ShutdownServer(qboolean crash)
        sv.active = false;
 
 // stop all client sounds immediately
-       if (cls.state == ca_connected)
-               CL_Disconnect ();
+       CL_Disconnect ();
 
 // flush any pending messages - like the score!!!
        start = Sys_DoubleTime();

diff --git a/host_cmd.c b/host_cmd.c
index f706171cb79866b858e061fb7a133751f2975835..a97af9f6ff0b5f2267ed47a391c986a67c8f6613 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1603,8 +1603,6 @@ Return to looping demos
 */
 void Host_Stopdemo_f (void)
 {
-       if (cls.state == ca_dedicated)
-               return;
        if (!cls.demoplayback)
                return;
        CL_Disconnect ();