renamed varray_ arrays to rsurface_array_, and they are no longer used outside the...

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 648e107bebbf6836fac9c3c96bcd0befdb50ee1b..e6ce99427d03c790e71ed34a86d703bc1895b13e 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -1702,8 +1702,6 @@ void SV_SpawnServer (const char *server)
 //
 // set up the new server
 //
 //
 // set up the new server
 //

-       Host_ClearMemory ();
-

        memset (&sv, 0, sizeof(sv));
 
        SV_VM_Setup();
        memset (&sv, 0, sizeof(sv));
 
        SV_VM_Setup();


@@ -1828,10 +1826,7 @@ void SV_SpawnServer (const char *server)
        }
 
        // load replacement entity file if found
        }
 
        // load replacement entity file if found

-       entities = NULL;
-       if (sv_entpatch.integer)
-               entities = (char *)FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true, NULL);
-       if (entities)
+       if (sv_entpatch.integer && (entities = (char *)FS_LoadFile(va("maps/%s.ent", sv.name), tempmempool, true, NULL)))

        {
                Con_Printf("Loaded maps/%s.ent\n", sv.name);
                PRVM_ED_LoadFromFile (entities);
        {
                Con_Printf("Loaded maps/%s.ent\n", sv.name);
                PRVM_ED_LoadFromFile (entities);