fix the name (DOWNLOADPROGRESS -> LOADPROGRESS)

[xonotic/darkplaces.git] / sv_main.c

diff --git a/sv_main.c b/sv_main.c
index 9fc0661004259b8519066c30c04eefeeda4e625f..b7fbd4df2352a7d52380b375fa00ab5bb6f1258e 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -157,6 +157,7 @@ cvar_t cutscene = {0, "cutscene", "1", "enables cutscenes in nehahra, can be use
 cvar_t sv_autodemo_perclient = {CVAR_SAVE, "sv_autodemo_perclient", "0", "set to 1 to enable autorecorded per-client demos (they'll start to record at the beginning of a match); set it to 2 to also record client->server packets (for debugging)"};
 cvar_t sv_autodemo_perclient_nameformat = {CVAR_SAVE, "sv_autodemo_perclient_nameformat", "sv_autodemos/%Y-%m-%d_%H-%M", "The format of the sv_autodemo_perclient filename, followed by the map name, the client number and the IP address + port number, separated by underscores (the date is encoded using strftime escapes)" };
 
+cvar_t halflifebsp = {0, "halflifebsp", "0", "indicates the current map is hlbsp format (useful to know because of different bounding box sizes)"};
 
 server_t sv;
 server_static_t svs;
@@ -438,6 +439,8 @@ void SV_Init (void)
        Cvar_RegisterVariable (&sv_autodemo_perclient);
        Cvar_RegisterVariable (&sv_autodemo_perclient_nameformat);
 
+       Cvar_RegisterVariable (&halflifebsp);
+
        // any special defaults for gamemodes go here
        if (gamemode == GAME_HIPNOTIC)
        {
@@ -800,7 +803,7 @@ void SV_SendServerinfo (client_t *client)
                        sb.data = (unsigned char *) buf;
                        sb.maxsize = sizeof(buf);
                        i = 0;
-                       while(MakeDownloadPacket(sv.csqc_progname, sv.csqc_progdata, sv.csqc_progsize, sv.csqc_progcrc, i++, &sb, sv.protocol))
+                       while(MakeDownloadPacket(sv.csqc_progname, svs.csqc_progdata, sv.csqc_progsize, sv.csqc_progcrc, i++, &sb, sv.protocol))
                                SV_WriteDemoMessage(client, &sb, false);
                }
 
@@ -2234,9 +2237,9 @@ static void SV_Download_f(void)
                Con_DPrintf("Downloading %s to %s\n", host_client->download_name, host_client->name);
 
                if(host_client->download_deflate)
-                       host_client->download_file = FS_FileFromData(sv.csqc_progdata_deflated, sv.csqc_progsize_deflated, true);
+                       host_client->download_file = FS_FileFromData(svs.csqc_progdata_deflated, svs.csqc_progsize_deflated, true);
                else
-                       host_client->download_file = FS_FileFromData(sv.csqc_progdata, sv.csqc_progsize, true);
+                       host_client->download_file = FS_FileFromData(svs.csqc_progdata, sv.csqc_progsize, true);
                
                // no, no space is needed between %s and %s :P
                Host_ClientCommands("\ncl_downloadbegin %i %s%s\n", (int)FS_FileSize(host_client->download_file), host_client->download_name, extensions);
@@ -2399,7 +2402,7 @@ int SV_ModelIndex(const char *s, int precachemode)
                                if (precachemode == 1)
                                        Con_Printf("SV_ModelIndex(\"%s\"): not precached (fix your code), precaching anyway\n", filename);
                                strlcpy(sv.model_precache[i], filename, sizeof(sv.model_precache[i]));
-                               sv.models[i] = Mod_ForName (sv.model_precache[i], true, false, false);
+                               sv.models[i] = Mod_ForName (sv.model_precache[i], true, false, s[0] == '*' ? sv.modelname : NULL);
                                if (sv.state != ss_loading)
                                {
                                        MSG_WriteByte(&sv.reliable_datagram, svc_precache);
@@ -2638,37 +2641,37 @@ void SV_Prepare_CSQC(void)
 {
        fs_offset_t progsize;
 
-       if(sv.csqc_progdata)
+       if(svs.csqc_progdata)
        {
                Con_DPrintf("Unloading old CSQC data.\n");
-               Mem_Free(sv.csqc_progdata);
-               if(sv.csqc_progdata_deflated)
-                       Mem_Free(sv.csqc_progdata_deflated);
+               Mem_Free(svs.csqc_progdata);
+               if(svs.csqc_progdata_deflated)
+                       Mem_Free(svs.csqc_progdata_deflated);
        }
 
-       sv.csqc_progdata = NULL;
-       sv.csqc_progdata_deflated = NULL;
+       svs.csqc_progdata = NULL;
+       svs.csqc_progdata_deflated = NULL;
        
        Con_Print("Loading csprogs.dat\n");
 
        sv.csqc_progname[0] = 0;
-       sv.csqc_progdata = FS_LoadFile(csqc_progname.string, sv_mempool, false, &progsize);
+       svs.csqc_progdata = FS_LoadFile(csqc_progname.string, sv_mempool, false, &progsize);
 
        if(progsize > 0)
        {
                size_t deflated_size;
                
                sv.csqc_progsize = (int)progsize;
-               sv.csqc_progcrc = CRC_Block(sv.csqc_progdata, progsize);
+               sv.csqc_progcrc = CRC_Block(svs.csqc_progdata, progsize);
                strlcpy(sv.csqc_progname, csqc_progname.string, sizeof(sv.csqc_progname));
                Con_Printf("server detected csqc progs file \"%s\" with size %i and crc %i\n", sv.csqc_progname, sv.csqc_progsize, sv.csqc_progcrc);
 
                Con_Print("Compressing csprogs.dat\n");
                //unsigned char *FS_Deflate(const unsigned char *data, size_t size, size_t *deflated_size, int level, mempool_t *mempool);
-               sv.csqc_progdata_deflated = FS_Deflate(sv.csqc_progdata, progsize, &deflated_size, -1, sv_mempool);
-               sv.csqc_progsize_deflated = (int)deflated_size;
+               svs.csqc_progdata_deflated = FS_Deflate(svs.csqc_progdata, progsize, &deflated_size, -1, sv_mempool);
+               svs.csqc_progsize_deflated = (int)deflated_size;
                Con_Printf("Deflated: %g%%\n", 100.0 - 100.0 * (deflated_size / (float)progsize));
-               Con_DPrintf("Uncompressed: %u\nCompressed:   %u\n", (unsigned)sv.csqc_progsize, (unsigned)sv.csqc_progsize_deflated);
+               Con_DPrintf("Uncompressed: %u\nCompressed:   %u\n", (unsigned)sv.csqc_progsize, (unsigned)svs.csqc_progsize_deflated);
        }
 }
 
@@ -2701,7 +2704,7 @@ void SV_SaveSpawnparms (void)
 
 /*
 ================
-SV_/pawnServer
+SV_SpawnServer
 
 This is called at the start of each level
 ================
@@ -2743,7 +2746,10 @@ void SV_SpawnServer (const char *server)
                SV_VM_End();
        }
 
-       worldmodel = Mod_ForName(modelname, false, true, true);
+       // free q3 shaders so that any newly downloaded shaders will be active
+       Mod_FreeQ3Shaders();
+
+       worldmodel = Mod_ForName(modelname, false, true, NULL);
        if (!worldmodel || !worldmodel->TraceBox)
        {
                Con_Printf("Couldn't load map %s\n", modelname);
@@ -2800,6 +2806,8 @@ void SV_SpawnServer (const char *server)
        // level's data which is no longer valiud
        cls.signon = 0;
 
+       Cvar_SetValue("halflifebsp", worldmodel->brush.ishlbsp);
+
        if(*sv_random_seed.string)
        {
                srand(sv_random_seed.integer);
@@ -2867,7 +2875,7 @@ void SV_SpawnServer (const char *server)
        for (i = 1;i < sv.worldmodel->brush.numsubmodels;i++)
        {
                dpsnprintf(sv.model_precache[i+1], sizeof(sv.model_precache[i+1]), "*%i", i);
-               sv.models[i+1] = Mod_ForName (sv.model_precache[i+1], false, false, false);
+               sv.models[i+1] = Mod_ForName (sv.model_precache[i+1], false, false, sv.modelname);
        }
 
 //