cvar_t cl_sound_ric1 = {0, "cl_sound_ric1", "weapons/ric1.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
cvar_t cl_sound_ric2 = {0, "cl_sound_ric2", "weapons/ric2.wav", "sound to play with 5% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
cvar_t cl_sound_ric3 = {0, "cl_sound_ric3", "weapons/ric3.wav", "sound to play with 10% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
+cvar_t cl_readpicture_force = {0, "cl_readpicture_force", "0", "when enabled, the low quality pictures read by ReadPicture() are preferred over the high quality pictures on the file system"};
#define RIC_GUNSHOT 1
#define RIC_GUNSHOTQUAD 2
r_refdef.fog_start = 0;
r_refdef.fog_alpha = 1;
r_refdef.fog_end = 16384;
+#if _MSC_VER >= 1400
+#define sscanf sscanf_s
+#endif
sscanf(value, "%f %f %f %f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue, &r_refdef.fog_alpha, &r_refdef.fog_start, &r_refdef.fog_end);
}
else if (!strcmp("fog_density", key))
if (cl.loadcsqc)
{
cl.loadcsqc = false;
+
CL_VM_Init();
}
}
// finished loading sounds
}
+ if(gamemode == GAME_NEXUIZ)
+ Cvar_SetValueQuick(&cl_serverextension_download, false);
+ // in Nexuiz, the built in download protocol is kinda broken (misses lots
+ // of dependencies) anyway, and can mess around with the game directory;
+ // until this is fixed, only support pk3 downloads via curl, and turn off
+ // individual file downloads other than for CSQC
+ // on the other end of the download protocol, GAME_NEXUIZ enforces writing
+ // to dlcache only
+ // idea: support download of pk3 files using this protocol later
+
// note: the reason these loops skip already-loaded things is that it
// enables this command to be issued during the game if desired
if (cl.downloadmodel_current == 1)
{
// we now have the worldmodel so we can set up the game world
+ // or maybe we do not have it (cl_serverextension_download 0)
+ // then we need to continue loading ANYWAY!
CL_SetupWorldModel();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
// save to disk only if we don't already have it
// (this is mainly for playing back demos)
existingcrc = FS_CRCFile(cls.qw_downloadname, &existingsize);
- if (existingsize)
+ if (existingsize || gamemode == GAME_NEXUIZ || !strcmp(cls.qw_downloadname, csqc_progname.string))
+ // let csprogs ALWAYS go to dlcache, to prevent "viral csprogs"; also, never put files outside dlcache for Nexuiz
{
if ((int)existingsize != size || existingcrc != crc)
{
cls.forcetrack = -1;
FS_Printf (cls.demofile, "%i\n", cls.forcetrack);
cls.demorecording = true;
+ strlcpy(cls.demoname, demofile, sizeof(cls.demoname));
}
else
Con_Print ("ERROR: couldn't open.\n");
Cvar_RegisterVariable(&cl_nettimesyncboundmode);
Cvar_RegisterVariable(&cl_nettimesyncboundtolerance);
Cvar_RegisterVariable(&cl_iplog_name);
+ Cvar_RegisterVariable(&cl_readpicture_force);
Cmd_AddCommand("nextul", QW_CL_NextUpload, "sends next fragment of current upload buffer (screenshot for example)");
Cmd_AddCommand("stopul", QW_CL_StopUpload, "aborts current upload (screenshot for example)");