client: Implement CL_Frame. Move client cvars out of host to cl_main

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index e2ec76bf1cef4c38d9310fbec2ad1b1942d009b9..8750bac1ebbd7e72beff2be32ec688202a234e32 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -3406,7 +3406,7 @@ This is called at the start of each level
 ================
 */
 
-void SV_SpawnServer (const char *server)
+void SV_SpawnServer (const char *map)
 {
        prvm_prog_t *prog = SVVM_prog;
        prvm_edict_t *ent;
@@ -3416,16 +3416,16 @@ void SV_SpawnServer (const char *server)
        char modelname[sizeof(sv.worldname)];
        char vabuf[1024];
 
-       Con_DPrintf("SpawnServer: %s\n", server);
+       Con_DPrintf("SpawnServer: %s\n", map);
 
-       dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", server);
+       dpsnprintf (modelname, sizeof(modelname), "maps/%s.bsp", map);
 
        if (!FS_FileExists(modelname))
        {
-               dpsnprintf (modelname, sizeof(modelname), "maps/%s", server);
+               dpsnprintf (modelname, sizeof(modelname), "maps/%s", map);
                if (!FS_FileExists(modelname))
                {
-                       Con_Printf("SpawnServer: no map file named maps/%s.bsp\n", server);
+                       Con_Printf("SpawnServer: no map file named maps/%s.bsp\n", map);
                        return;
                }
        }
@@ -3530,7 +3530,7 @@ void SV_SpawnServer (const char *server)
        sv.active = true;
 
        // set level base name variables for later use
-       strlcpy (sv.name, server, sizeof (sv.name));
+       strlcpy (sv.name, map, sizeof (sv.name));
        strlcpy(sv.worldname, modelname, sizeof(sv.worldname));
        FS_StripExtension(sv.worldname, sv.worldnamenoextension, sizeof(sv.worldnamenoextension));
        strlcpy(sv.worldbasename, !strncmp(sv.worldnamenoextension, "maps/", 5) ? sv.worldnamenoextension + 5 : sv.worldnamenoextension, sizeof(sv.worldbasename));
@@ -4210,7 +4210,7 @@ static int SV_ThreadFunc(void *voiddata)
                        sv.frametime = advancetime * host_timescale.value;
                        if (host_framerate.value)
                                sv.frametime = host_framerate.value;
-                       if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive || cl.csqc_paused)))
+                       if (sv.paused || host.paused)
                                sv.frametime = 0;
 
                        sv_timer -= advancetime;