cl_nettimesyncboundmode: use default if invalid

[xonotic/darkplaces.git] / csprogs.c

diff --git a/csprogs.c b/csprogs.c
index 9800fe0a907fecff8507ee1ed21e4ad84d502f2d..20c318a848fa3ae76d51b9ddac22a2368b47845d 100644 (file)
--- a/csprogs.c
+++ b/csprogs.c
@@ -883,7 +883,7 @@ static void CLVM_end_increase_edicts(prvm_prog_t *prog)
 
        // link every entity except world
        for (i = 1, ent = prog->edicts;i < prog->num_edicts;i++, ent++)
-               if (!ent->free && !VectorCompare(PRVM_clientedictvector(ent, absmin), PRVM_clientedictvector(ent, absmax)))
+               if (!ent->free)
                        CL_LinkEdict(ent);
 }
 
@@ -1043,8 +1043,7 @@ void CL_VM_Init (void)
                        else
                        {
                                Mem_Free(csprogsdata);
-                               Con_Printf(CON_ERROR "Your %s is not the same version as the server (CRC is %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
-                               CL_Disconnect();
+                               CL_DisconnectEx(false, "Your %s is not the same version as the server (CRC is %i/%i but should be %i/%i)\n", csqc_progname.string, csprogsdatacrc, (int)csprogsdatasize, requiredcrc, requiredsize);
                                return;
                        }
                }
@@ -1052,13 +1051,7 @@ void CL_VM_Init (void)
        else
        {
                if (requiredcrc >= 0)
-               {
-                       if (cls.demoplayback)
-                               Con_Printf(CON_ERROR "CL_VM_Init: demo requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
-                       else
-                               Con_Printf(CON_ERROR "CL_VM_Init: server requires CSQC, but \"%s\" wasn't found\n", csqc_progname.string);
-                       CL_Disconnect();
-               }
+                       CL_DisconnectEx(false, CON_ERROR "CL_VM_Init: %s requires CSQC, but \"%s\" wasn't found\n", cls.demoplayback ? "demo" : "server", csqc_progname.string);
                return;
        }
 
@@ -1094,11 +1087,8 @@ void CL_VM_Init (void)
 
        if (!prog->loaded)
        {
-               Host_Error("CSQC %s failed to load\n", csprogsfn);
-               if(!sv.active)
-                       CL_Disconnect();
                Mem_Free(csprogsdata);
-               return;
+               Host_Error("CSQC %s failed to load\n", csprogsfn);
        }
 
        if(cls.demorecording)