"", // 47
"", // 48
"", // 49
- "svc_cgame", // 50 // [short] length [bytes] data
+ "svc_downloaddata", // 50 // [int] start [short] size [variable length] data
"svc_updatestatubyte", // 51 // [byte] stat [byte] value
"svc_effect", // 52 // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate
"svc_effect2", // 53 // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate
cvar_t demo_nehahra = {0, "demo_nehahra", "0", "reads all quake demos as nehahra movie protocol"};
cvar_t developer_networkentities = {0, "developer_networkentities", "0", "prints received entities, value is 0-4 (higher for more info)"};
+cvar_t cl_sound_wizardhit = {0, "cl_sound_wizardhit", "wizard/hit.wav", "sound to play during TE_WIZSPIKE (empty cvar disables sound)"};
+cvar_t cl_sound_hknighthit = {0, "cl_sound_hknighthit", "hknight/hit.wav", "sound to play during TE_KNIGHTSPIKE (empty cvar disables sound)"};
+cvar_t cl_sound_tink1 = {0, "cl_sound_tink1", "weapons/tink1.wav", "sound to play with 80% chance during TE_SPIKE/TE_SUPERSPIKE (empty cvar disables sound)"};
+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_sound_r_exp3 = {0, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"};
+cvar_t cl_serverextension_download = {0, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
+cvar_t cl_joinbeforedownloadsfinish = {0, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
+cvar_t cl_nettimesyncmode = {0, "cl_nettimesyncmode", "2", "selects method of time synchronization in client with regard to server packets, values are: 0 = no sync, 1 = exact sync (reset timing each packet), 2 = loose sync (reset timing only if it is out of bounds), 3 = tight sync and bounding"};
static qboolean QW_CL_CheckOrDownloadFile(const char *filename);
static void QW_CL_RequestNextDownload(void);
*/
static unsigned char olddata[NET_MAXMESSAGE];
-void CL_KeepaliveMessage (void)
+void CL_KeepaliveMessage (qboolean readmessages)
{
float time;
static double nextmsg = -1;
if (sv.active || !cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD)
return;
-// read messages from server, should just be nops
- oldreadcount = msg_readcount;
- oldbadread = msg_badread;
- old = net_message;
- memcpy(olddata, net_message.data, net_message.cursize);
-
- NetConn_ClientFrame();
-
- msg_readcount = oldreadcount;
- msg_badread = oldbadread;
- net_message = old;
- memcpy(net_message.data, olddata, net_message.cursize);
+ if (readmessages)
+ {
+ // read messages from server, should just be nops
+ oldreadcount = msg_readcount;
+ oldbadread = msg_badread;
+ old = net_message;
+ memcpy(olddata, net_message.data, net_message.cursize);
+
+ NetConn_ClientFrame();
+
+ msg_readcount = oldreadcount;
+ msg_badread = oldbadread;
+ net_message = old;
+ memcpy(net_message.data, olddata, net_message.cursize);
+ }
if (cls.netcon && (time = Sys_DoubleTime()) >= nextmsg)
{
memset(&msg, 0, sizeof(msg));
msg.data = buf;
msg.maxsize = sizeof(buf);
- MSG_WriteChar(&msg, svc_nop);
+ MSG_WriteChar(&msg, clc_nop);
NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol);
}
}
data = entdata;
if (!data)
return;
- if (!COM_ParseToken(&data, false))
+ if (!COM_ParseTokenConsole(&data))
return; // error
if (com_token[0] != '{')
return; // error
while (1)
{
- if (!COM_ParseToken(&data, false))
+ if (!COM_ParseTokenConsole(&data))
return; // error
if (com_token[0] == '}')
break; // end of worldspawn
strlcpy (key, com_token, sizeof (key));
while (key[strlen(key)-1] == ' ') // remove trailing spaces
key[strlen(key)-1] = 0;
- if (!COM_ParseToken(&data, false))
+ if (!COM_ParseTokenConsole(&data))
return; // error
strlcpy (value, com_token, sizeof (value));
if (!strcmp("sky", key))
else if (!strcmp("qlsky", key)) // non-standard, introduced by QuakeLives (EEK)
R_SetSkyBox(value);
else if (!strcmp("fog", key))
- sscanf(value, "%f %f %f %f", &fog_density, &fog_red, &fog_green, &fog_blue);
+ sscanf(value, "%f %f %f %f", &r_refdef.fog_density, &r_refdef.fog_red, &r_refdef.fog_green, &r_refdef.fog_blue);
else if (!strcmp("fog_density", key))
- fog_density = atof(value);
+ r_refdef.fog_density = atof(value);
else if (!strcmp("fog_red", key))
- fog_red = atof(value);
+ r_refdef.fog_red = atof(value);
else if (!strcmp("fog_green", key))
- fog_green = atof(value);
+ r_refdef.fog_green = atof(value);
else if (!strcmp("fog_blue", key))
- fog_blue = atof(value);
+ r_refdef.fog_blue = atof(value);
}
}
cls.qw_downloadnumber++;
cls.qw_downloadpercent = 0;
+ cls.qw_downloadmemorycursize = 0;
return false;
}
// now that we have a world model, set up the world entity, renderer
// modules and csqc
- cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_BoundingBoxForEntity(&cl_entities[0].render);
+ cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+ CL_UpdateRenderEntity(&cl.entities[0].render);
R_Modules_NewMap();
- CL_CGVM_Start();
+
+ // TODO: add pmodel/emodel player.mdl/eyes.mdl CRCs to userinfo
// done checking sounds and models, send a prespawn command now
MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
Mem_Free(cls.qw_downloadmemory);
cls.qw_downloadmemory = NULL;
}
+
+ // done loading
+ cl.loadfinished = true;
break;
case dl_sound:
if (cls.qw_downloadnumber == 0)
S_ServerSounds(cl.sound_name, cls.qw_downloadnumber);
// precache any sounds used by the client
- cl.sfx_wizhit = S_PrecacheSound("sound/wizard/hit.wav", false, true);
- cl.sfx_knighthit = S_PrecacheSound("sound/hknight/hit.wav", false, true);
- cl.sfx_tink1 = S_PrecacheSound("sound/weapons/tink1.wav", false, true);
- cl.sfx_ric1 = S_PrecacheSound("sound/weapons/ric1.wav", false, true);
- cl.sfx_ric2 = S_PrecacheSound("sound/weapons/ric2.wav", false, true);
- cl.sfx_ric3 = S_PrecacheSound("sound/weapons/ric3.wav", false, true);
- cl.sfx_r_exp3 = S_PrecacheSound("sound/weapons/r_exp3.wav", false, true);
+ cl.sfx_wizhit = S_PrecacheSound(cl_sound_wizardhit.string, false, true);
+ cl.sfx_knighthit = S_PrecacheSound(cl_sound_hknighthit.string, false, true);
+ cl.sfx_tink1 = S_PrecacheSound(cl_sound_tink1.string, false, true);
+ cl.sfx_ric1 = S_PrecacheSound(cl_sound_ric1.string, false, true);
+ cl.sfx_ric2 = S_PrecacheSound(cl_sound_ric2.string, false, true);
+ cl.sfx_ric3 = S_PrecacheSound(cl_sound_ric3.string, false, true);
+ cl.sfx_r_exp3 = S_PrecacheSound(cl_sound_r_exp3.string, false, true);
// sounds
for (i = 1;i < MAX_SOUNDS && cl.sound_name[i][0];i++)
while (cls.qw_downloadmemorymaxsize < cls.qw_downloadmemorycursize + size)
cls.qw_downloadmemorymaxsize *= 2;
old = cls.qw_downloadmemory;
- cls.qw_downloadmemory = Mem_Alloc(cl_mempool, cls.qw_downloadmemorymaxsize);
+ cls.qw_downloadmemory = (unsigned char *)Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize);
if (old)
{
memcpy(cls.qw_downloadmemory, old, cls.qw_downloadmemorycursize);
// read the fragment out of the packet
MSG_ReadBytes(size, cls.qw_downloadmemory + cls.qw_downloadmemorycursize);
cls.qw_downloadmemorycursize += size;
+ cls.qw_downloadspeedcount += size;
cls.qw_downloadpercent = percent;
if (nummodels==MAX_MODELS)
Host_Error("Server sent too many model precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy(cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels]));
}
if (numsounds==MAX_SOUNDS)
Host_Error("Server sent too many sound precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy(cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds]));
}
Con_DPrintf("Starting upload of %d bytes...\n", size);
- cls.qw_uploaddata = Mem_Alloc(cl_mempool, size);
+ cls.qw_uploaddata = (unsigned char *)Mem_Alloc(cls.permanentmempool, size);
memcpy(cls.qw_uploaddata, data, size);
cls.qw_uploadsize = size;
cls.qw_uploadpos = 0;
}
}
-static void QW_CL_UpdateItemsAndWeapon(void)
+static void CL_UpdateItemsAndWeapon(void)
{
int j;
// check for important changes
cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
}
+void CL_BeginDownloads(qboolean aborteddownload)
+{
+ // quakeworld works differently
+ if (cls.protocol == PROTOCOL_QUAKEWORLD)
+ return;
+
+ // TODO: this would be a good place to do curl downloads
+
+ if (cl.downloadcsqc)
+ {
+ size_t progsize;
+ cl.downloadcsqc = false;
+ if (cls.netcon
+ && !sv.active
+ && csqc_progname.string
+ && csqc_progname.string[0]
+ && csqc_progcrc.integer >= 0
+ && cl_serverextension_download.integer
+ && (FS_CRCFile(csqc_progname.string, &progsize) != csqc_progcrc.integer || ((int)progsize != csqc_progsize.integer && csqc_progsize.integer != -1))
+ && !FS_FileExists(va("dlcache/%s.%i.%i", csqc_progname.string, csqc_progsize.integer, csqc_progcrc.integer)))
+ Cmd_ForwardStringToServer(va("download %s", csqc_progname.string));
+ }
+
+ if (cl.loadmodel_current < cl.loadmodel_total)
+ {
+ // loading models
+
+ for (;cl.loadmodel_current < cl.loadmodel_total;cl.loadmodel_current++)
+ {
+ if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw)
+ continue;
+ if (cls.signon < SIGNONS)
+ CL_KeepaliveMessage(true);
+ cl.model_precache[cl.loadmodel_current] = Mod_ForName(cl.model_name[cl.loadmodel_current], false, false, cl.loadmodel_current == 1);
+ if (cl.model_precache[cl.loadmodel_current] && cl.model_precache[cl.loadmodel_current]->Draw && cl.loadmodel_current == 1)
+ {
+ // we now have the worldmodel so we can set up the game world
+ cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+ CL_UpdateRenderEntity(&cl.entities[0].render);
+ R_Modules_NewMap();
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+ if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
+ {
+ cl.loadfinished = true;
+ // now issue the spawn to move on to signon 3 like normal
+ if (cls.netcon)
+ Cmd_ForwardStringToServer("spawn");
+ }
+ }
+ }
+
+ // finished loading models
+ }
+
+ if (cl.loadsound_current < cl.loadsound_total)
+ {
+ // loading sounds
+
+ for (;cl.loadsound_current < cl.loadsound_total;cl.loadsound_current++)
+ {
+ if (cl.sound_precache[cl.loadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.loadsound_current]))
+ continue;
+ if (cls.signon < SIGNONS)
+ CL_KeepaliveMessage(true);
+ // Don't lock the sfx here, S_ServerSounds already did that
+ cl.sound_precache[cl.loadsound_current] = S_PrecacheSound(cl.sound_name[cl.loadsound_current], false, false);
+ }
+
+ // finished loading sounds
+ }
+
+ // 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 < cl.loadmodel_total)
+ {
+ // loading models
+
+ for (;cl.downloadmodel_current < cl.loadmodel_total;cl.downloadmodel_current++)
+ {
+ if (aborteddownload)
+ {
+ if (cl.downloadmodel_current == 1)
+ {
+ // the worldmodel failed, but we need to set up anyway
+ cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+ CL_UpdateRenderEntity(&cl.entities[0].render);
+ R_Modules_NewMap();
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+ if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
+ {
+ cl.loadfinished = true;
+ // now issue the spawn to move on to signon 3 like normal
+ if (cls.netcon)
+ Cmd_ForwardStringToServer("spawn");
+ }
+ }
+ aborteddownload = false;
+ continue;
+ }
+ if (cl.model_precache[cl.downloadmodel_current] && cl.model_precache[cl.downloadmodel_current]->Draw)
+ continue;
+ if (cls.signon < SIGNONS)
+ CL_KeepaliveMessage(true);
+ if (!FS_FileExists(cl.model_name[cl.downloadmodel_current]))
+ {
+ if (cl.downloadmodel_current == 1)
+ Con_Printf("Map %s not found\n", cl.model_name[cl.downloadmodel_current]);
+ else
+ Con_Printf("Model %s not found\n", cl.model_name[cl.downloadmodel_current]);
+ // regarding the * check: don't try to download submodels
+ if (cl_serverextension_download.integer && cls.netcon && cl.model_name[cl.downloadmodel_current][0] != '*' && !sv.active)
+ {
+ Cmd_ForwardStringToServer(va("download %s", cl.model_name[cl.downloadmodel_current]));
+ // we'll try loading again when the download finishes
+ return;
+ }
+ }
+ cl.model_precache[cl.downloadmodel_current] = Mod_ForName(cl.model_name[cl.downloadmodel_current], false, false, cl.downloadmodel_current == 1);
+ if (cl.downloadmodel_current == 1)
+ {
+ // we now have the worldmodel so we can set up the game world
+ cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
+ CL_UpdateRenderEntity(&cl.entities[0].render);
+ R_Modules_NewMap();
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+ if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
+ {
+ cl.loadfinished = true;
+ // now issue the spawn to move on to signon 3 like normal
+ if (cls.netcon)
+ Cmd_ForwardStringToServer("spawn");
+ }
+ }
+ }
+
+ // finished loading models
+ }
+
+ if (cl.downloadsound_current < cl.loadsound_total)
+ {
+ // loading sounds
+
+ for (;cl.downloadsound_current < cl.loadsound_total;cl.downloadsound_current++)
+ {
+ char soundname[MAX_QPATH];
+ if (aborteddownload)
+ {
+ aborteddownload = false;
+ continue;
+ }
+ if (cl.sound_precache[cl.downloadsound_current] && S_IsSoundPrecached(cl.sound_precache[cl.downloadsound_current]))
+ continue;
+ if (cls.signon < SIGNONS)
+ CL_KeepaliveMessage(true);
+ dpsnprintf(soundname, sizeof(soundname), "sound/%s", cl.sound_name[cl.downloadsound_current]);
+ if (!FS_FileExists(soundname) && !FS_FileExists(cl.sound_name[cl.downloadsound_current]))
+ {
+ Con_Printf("Sound %s not found\n", soundname);
+ if (cl_serverextension_download.integer && cls.netcon && !sv.active)
+ {
+ Cmd_ForwardStringToServer(va("download %s", soundname));
+ // we'll try loading again when the download finishes
+ return;
+ }
+ }
+ // Don't lock the sfx here, S_ServerSounds already did that
+ cl.sound_precache[cl.downloadsound_current] = S_PrecacheSound(cl.sound_name[cl.downloadsound_current], false, false);
+ }
+
+ // finished loading sounds
+ }
+
+ if (!cl.loadfinished)
+ {
+ cl.loadfinished = true;
+
+ // check memory integrity
+ Mem_CheckSentinelsGlobal();
+
+ // now issue the spawn to move on to signon 3 like normal
+ if (cls.netcon)
+ Cmd_ForwardStringToServer("spawn");
+ }
+}
+
+void CL_BeginDownloads_f(void)
+{
+ CL_BeginDownloads(false);
+}
+
+void CL_StopDownload(int size, int crc)
+{
+ if (cls.qw_downloadmemory && cls.qw_downloadmemorycursize == size && CRC_Block(cls.qw_downloadmemory, size) == crc)
+ {
+ int existingcrc;
+ size_t existingsize;
+ const char *extension;
+
+ // finished file
+ // 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 ((int)existingsize != size || existingcrc != crc)
+ {
+ // we have a mismatching file, pick another name for it
+ char name[MAX_QPATH*2];
+ dpsnprintf(name, sizeof(name), "dlcache/%s.%i.%i", cls.qw_downloadname, size, crc);
+ if (!FS_FileExists(name))
+ {
+ Con_Printf("Downloaded \"%s\" (%i bytes, %i CRC)\n", name, size, crc);
+ FS_WriteFile(name, cls.qw_downloadmemory, cls.qw_downloadmemorycursize);
+ }
+ }
+ }
+ else
+ {
+ // we either don't have it or have a mismatching file...
+ // so it's time to accept the file
+ // but if we already have a mismatching file we need to rename
+ // this new one, and if we already have this file in renamed form,
+ // we do nothing
+ Con_Printf("Downloaded \"%s\" (%i bytes, %i CRC)\n", cls.qw_downloadname, size, crc);
+ FS_WriteFile(cls.qw_downloadname, cls.qw_downloadmemory, cls.qw_downloadmemorycursize);
+ extension = FS_FileExtension(cls.qw_downloadname);
+ if (!strcasecmp(extension, "pak") || !strcasecmp(extension, "pk3"))
+ FS_Rescan();
+ }
+ }
+
+ if (cls.qw_downloadmemory)
+ Mem_Free(cls.qw_downloadmemory);
+ cls.qw_downloadmemory = NULL;
+ cls.qw_downloadname[0] = 0;
+ cls.qw_downloadmemorymaxsize = 0;
+ cls.qw_downloadmemorycursize = 0;
+ cls.qw_downloadpercent = 0;
+}
+
+void CL_ParseDownload(void)
+{
+ int i, start, size;
+ unsigned char data[65536];
+ start = MSG_ReadLong();
+ size = (unsigned short)MSG_ReadShort();
+
+ // record the start/size information to ack in the next input packet
+ for (i = 0;i < CL_MAX_DOWNLOADACKS;i++)
+ {
+ if (!cls.dp_downloadack[i].start && !cls.dp_downloadack[i].size)
+ {
+ cls.dp_downloadack[i].start = start;
+ cls.dp_downloadack[i].size = size;
+ break;
+ }
+ }
+
+ MSG_ReadBytes(size, data);
+
+ if (!cls.qw_downloadname[0])
+ {
+ if (size > 0)
+ Con_Printf("CL_ParseDownload: received %i bytes with no download active\n", size);
+ return;
+ }
+
+ if (start + size > cls.qw_downloadmemorymaxsize)
+ Host_Error("corrupt download message\n");
+
+ // only advance cursize if the data is at the expected position
+ // (gaps are unacceptable)
+ memcpy(cls.qw_downloadmemory + start, data, size);
+ cls.qw_downloadmemorycursize = start + size;
+ cls.qw_downloadpercent = (int)floor((start+size) * 100.0 / cls.qw_downloadmemorymaxsize);
+ cls.qw_downloadpercent = bound(0, cls.qw_downloadpercent, 100);
+ cls.qw_downloadspeedcount += size;
+}
+
+void CL_DownloadBegin_f(void)
+{
+ int size = atoi(Cmd_Argv(1));
+
+ if (size < 0 || size > 1<<30 || FS_CheckNastyPath(Cmd_Argv(2), false))
+ {
+ Con_Printf("cl_downloadbegin: received bogus information\n");
+ CL_StopDownload(0, 0);
+ return;
+ }
+
+ if (cls.qw_downloadname[0])
+ Con_Printf("Download of %s aborted\n", cls.qw_downloadname);
+
+ CL_StopDownload(0, 0);
+
+ // we're really beginning a download now, so initialize stuff
+ strlcpy(cls.qw_downloadname, Cmd_Argv(2), sizeof(cls.qw_downloadname));
+ cls.qw_downloadmemorymaxsize = size;
+ cls.qw_downloadmemory = Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize);
+ cls.qw_downloadnumber++;
+
+ Cmd_ForwardStringToServer("sv_startdownload");
+}
+
+void CL_StopDownload_f(void)
+{
+ if (cls.qw_downloadname[0])
+ {
+ Con_Printf("Download of %s aborted\n", cls.qw_downloadname);
+ CL_StopDownload(0, 0);
+ }
+ CL_BeginDownloads(true);
+}
+
+void CL_DownloadFinished_f(void)
+{
+ if (Cmd_Argc() < 3)
+ {
+ Con_Printf("Malformed cl_downloadfinished command\n");
+ return;
+ }
+ CL_StopDownload(atoi(Cmd_Argv(1)), atoi(Cmd_Argv(2)));
+ CL_BeginDownloads(false);
+}
+
/*
=====================
CL_SignonReply
MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
MSG_WriteString (&cls.netcon->message, "prespawn");
}
+ else // playing a demo... make sure loading occurs as soon as possible
+ CL_BeginDownloads(false);
break;
case 2:
MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer));
- MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
- MSG_WriteString (&cls.netcon->message, "spawn");
+ // LordHavoc: changed to begin a loading stage and issue this when done
+ //MSG_WriteByte (&cls.netcon->message, clc_stringcmd);
+ //MSG_WriteString (&cls.netcon->message, "spawn");
+
+ // execute cl_begindownloads next frame after this message is sent
+ // (so that the server can see the player name while downloading)
+ Cbuf_AddText("\ncl_begindownloads\n");
}
break;
// check memory integrity
Mem_CheckSentinelsGlobal();
+ // clear cl_serverextension cvars
+ Cvar_SetValueQuick(&cl_serverextension_download, 0);
+
//
// wipe the client_state_t struct
//
cls.protocol = protocol;
Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cls.protocol));
- cl_num_entities = 1;
+ cl.num_entities = 1;
if (protocol == PROTOCOL_QUAKEWORLD)
{
+ char gamedir[1][MAX_QPATH];
+
cl.qw_servercount = MSG_ReadLong();
str = MSG_ReadString();
Con_Printf("server gamedir is %s\n", str);
-#if 0
- // FIXME: change gamedir if needed!
- if (strcasecmp(gamedirfile, str))
- {
- Host_SaveConfig_f();
- cflag = 1;
- }
+ strlcpy(gamedir[0], str, sizeof(gamedir[0]));
- Com_Gamedir(str); // change gamedir
-
- if (cflag)
- {
- // exec the new config stuff
- }
-#endif
+ // change gamedir if needed
+ if (!FS_ChangeGameDirs(1, gamedir, true, false))
+ Host_Error("CL_ParseServerInfo: unable to switch to server specified gamedir");
cl.gametype = GAME_DEATHMATCH;
cl.maxclients = 32;
// parse player number
i = MSG_ReadByte();
- cl.qw_spectator = (i & 128) != 0;
+ // cl.qw_spectator is an unneeded flag, cl.scores[cl.playerentity].qw_spectator works better (it can be updated by the server during the game)
+ //cl.qw_spectator = (i & 128) != 0;
cl.playerentity = cl.viewentity = (i & 127) + 1;
- cl.scores = (scoreboard_t *)Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores));
+ cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores));
// get the full level name
str = MSG_ReadString ();
// check memory integrity
Mem_CheckSentinelsGlobal();
- MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
- MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0));
+ if (cls.netcon)
+ {
+ MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
+ MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0));
+ }
+
+ cl.loadfinished = false;
cls.state = ca_connected;
cls.signon = 1;
Host_Error("Bad maxclients (%u) from server", cl.maxclients);
return;
}
- cl.scores = (scoreboard_t *)Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores));
+ cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores));
// parse gametype
cl.gametype = MSG_ReadByte ();
if (nummodels==MAX_MODELS)
Host_Error ("Server sent too many model precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error ("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy (cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels]));
}
// parse sound precache list
if (numsounds==MAX_SOUNDS)
Host_Error("Server sent too many sound precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy (cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds]));
}
S_ServerSounds (cl.sound_name, numsounds);
// precache any sounds used by the client
- cl.sfx_wizhit = S_PrecacheSound("sound/wizard/hit.wav", false, true);
- cl.sfx_knighthit = S_PrecacheSound("sound/hknight/hit.wav", false, true);
- cl.sfx_tink1 = S_PrecacheSound("sound/weapons/tink1.wav", false, true);
- cl.sfx_ric1 = S_PrecacheSound("sound/weapons/ric1.wav", false, true);
- cl.sfx_ric2 = S_PrecacheSound("sound/weapons/ric2.wav", false, true);
- cl.sfx_ric3 = S_PrecacheSound("sound/weapons/ric3.wav", false, true);
- cl.sfx_r_exp3 = S_PrecacheSound("sound/weapons/r_exp3.wav", false, true);
+ cl.sfx_wizhit = S_PrecacheSound(cl_sound_wizardhit.string, false, true);
+ cl.sfx_knighthit = S_PrecacheSound(cl_sound_hknighthit.string, false, true);
+ cl.sfx_tink1 = S_PrecacheSound(cl_sound_tink1.string, false, true);
+ cl.sfx_ric1 = S_PrecacheSound(cl_sound_ric1.string, false, true);
+ cl.sfx_ric2 = S_PrecacheSound(cl_sound_ric2.string, false, true);
+ cl.sfx_ric3 = S_PrecacheSound(cl_sound_ric3.string, false, true);
+ cl.sfx_r_exp3 = S_PrecacheSound(cl_sound_r_exp3.string, false, true);
// now we try to load everything that is new
-
- // world model
- CL_KeepaliveMessage ();
- cl.model_precache[1] = Mod_ForName(cl.model_name[1], false, false, true);
- if (cl.model_precache[1]->Draw == NULL)
- Con_Printf("Map %s not found\n", cl.model_name[1]);
-
- // normal models
- for (i=2 ; i<nummodels ; i++)
- {
- CL_KeepaliveMessage();
- if ((cl.model_precache[i] = Mod_ForName(cl.model_name[i], false, false, false))->Draw == NULL)
- Con_Printf("Model %s not found\n", cl.model_name[i]);
- }
-
- // sounds
- for (i=1 ; i<numsounds ; i++)
- {
- CL_KeepaliveMessage();
- // Don't lock the sfx here, S_ServerSounds already did that
- cl.sound_precache[i] = S_PrecacheSound (cl.sound_name[i], true, false);
- }
-
- // we now have the worldmodel so we can set up the game world
- cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_BoundingBoxForEntity(&cl_entities[0].render);
- R_Modules_NewMap();
- CL_CGVM_Start();
+ cl.loadmodel_current = 1;
+ cl.downloadmodel_current = 1;
+ cl.loadmodel_total = nummodels;
+ cl.loadsound_current = 1;
+ cl.downloadsound_current = 1;
+ cl.loadsound_total = numsounds;
+ cl.downloadcsqc = true;
+ cl.loadfinished = false;
}
// check memory integrity
if (!s->active)
return;
- if (s->modelindex >= MAX_MODELS && (65536-s->modelindex) >= MAX_MODELS)
+ if (s->modelindex >= MAX_MODELS)
Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS);
// colormap is client index + 1
ent->persistent.muzzleflash = 0;
VectorCopy(ent->state_current.origin, ent->persistent.trail_origin);
}
- else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000)
+ else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000 || (cl.fixangle[0] && !cl.fixangle[1]))
{
// don't interpolate the move
+ // (the fixangle[] check detects teleports, but not constant fixangles
+ // such as when spectating)
ent->persistent.lerpdeltatime = 0;
ent->persistent.lerpstarttime = cl.mtime[1];
VectorCopy(ent->state_current.origin, ent->persistent.oldorigin);
VectorCopy(ent->state_current.origin, ent->persistent.neworigin);
VectorCopy(ent->state_current.angles, ent->persistent.newangles);
}
+ // trigger muzzleflash effect if necessary
+ if (ent->state_current.effects & EF_MUZZLEFLASH)
+ ent->persistent.muzzleflash = 1;
}
/*
ent->state_baseline.origin[i] = MSG_ReadCoord(cls.protocol);
ent->state_baseline.angles[i] = MSG_ReadAngle(cls.protocol);
}
- CL_ValidateState(&ent->state_baseline);
ent->state_previous = ent->state_current = ent->state_baseline;
}
*/
void CL_ParseClientdata (void)
{
- int i, j, bits;
+ int i, bits;
VectorCopy (cl.mpunchangle[0], cl.mpunchangle[1]);
VectorCopy (cl.mpunchvector[0], cl.mpunchvector[1]);
cl.stats[STAT_ITEMS] = MSG_ReadLong ();
cl.onground = (bits & SU_ONGROUND) != 0;
- csqc_onground = cl.onground; //[515]: cause without this csqc will receive not right value on svc_print =/
cl.inwater = (bits & SU_INWATER) != 0;
if (cls.protocol == PROTOCOL_DARKPLACES5)
cl.stats[STAT_VIEWZOOM] = (unsigned short) MSG_ReadShort();
}
- // check for important changes
-
- // set flash times
- if (cl.olditems != cl.stats[STAT_ITEMS])
- for (j = 0;j < 32;j++)
- if ((cl.stats[STAT_ITEMS] & (1<<j)) && !(cl.olditems & (1<<j)))
- cl.item_gettime[j] = cl.time;
- cl.olditems = cl.stats[STAT_ITEMS];
-
- // GAME_NEXUIZ hud needs weapon change time
- if (cl.activeweapon != cl.stats[STAT_ACTIVEWEAPON])
- cl.weapontime = cl.time;
- cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON];
-
// viewzoom interpolation
cl.mviewzoom[0] = (float) max(cl.stats[STAT_VIEWZOOM], 2) * (1.0f / 255.0f);
}
{
entity_t *ent;
- if (cl_num_static_entities >= cl_max_static_entities)
+ if (cl.num_static_entities >= cl.max_static_entities)
Host_Error ("Too many static entities");
- ent = &cl_static_entities[cl_num_static_entities++];
+ ent = &cl.static_entities[cl.num_static_entities++];
CL_ParseBaseline (ent, large);
// copy it to the current state
ent->render.skinnum = ent->state_baseline.skin;
ent->render.effects = ent->state_baseline.effects;
ent->render.alpha = 1;
- //ent->render.scale = 1;
//VectorCopy (ent->state_baseline.origin, ent->render.origin);
//VectorCopy (ent->state_baseline.angles, ent->render.angles);
Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1);
- Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
- CL_BoundingBoxForEntity(&ent->render);
+ CL_UpdateRenderEntity(&ent->render);
- // This is definitely cheating...
- if (ent->render.model == NULL)
- cl_num_static_entities--;
+ // This is definitely a cheesy way to conserve resources...
+ //if (ent->render.model == NULL)
+ // cl.num_static_entities--;
}
/*
CL_Effect(org, modelindex, startframe, framecount, framerate);
}
-void CL_ParseBeam (model_t *m, int lightning)
+void CL_NewBeam (int ent, vec3_t start, vec3_t end, model_t *m, int lightning)
{
- int i, ent;
- vec3_t start, end;
+ int i;
beam_t *b = NULL;
- ent = (unsigned short) MSG_ReadShort ();
- MSG_ReadVector(start, cls.protocol);
- MSG_ReadVector(end, cls.protocol);
-
if (ent >= MAX_EDICTS)
{
- Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent);
+ Con_Printf("CL_NewBeam: invalid entity number %i\n", ent);
ent = 0;
}
- if (ent >= cl_max_entities)
+ if (ent >= cl.max_entities)
CL_ExpandEntities(ent);
// override any beam with the same entity
- i = cl_max_beams;
+ i = cl.max_beams;
if (ent)
- for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
+ for (i = 0, b = cl.beams;i < cl.max_beams;i++, b++)
if (b->entity == ent)
break;
// if the entity was not found then just replace an unused beam
- if (i == cl_max_beams)
- for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++)
- if (!b->model || b->endtime < cl.time)
+ if (i == cl.max_beams)
+ for (i = 0, b = cl.beams;i < cl.max_beams;i++, b++)
+ if (!b->model)
break;
- if (i < cl_max_beams)
+ if (i < cl.max_beams)
{
+ cl.num_beams = max(cl.num_beams, i + 1);
b->entity = ent;
b->lightning = lightning;
b->model = m;
- b->endtime = cl.time + 0.2;
+ b->endtime = cl.mtime[0] + 0.2;
VectorCopy (start, b->start);
VectorCopy (end, b->end);
- b->relativestartvalid = 0;
- if (ent && cl_entities[ent].state_current.active)
- {
- entity_state_t *p;
- matrix4x4_t matrix, imatrix;
- if (ent == cl.viewentity && cl.movement)
- p = &cl_entities[b->entity].state_previous;
- else
- p = &cl_entities[b->entity].state_current;
- // not really valid yet, we need to get the orientation now
- // (ParseBeam flagged this because it is received before
- // entities are received, by now they have been received)
- // note: because players create lightning in their think
- // function (which occurs before movement), they actually
- // have some lag in it's location, so compare to the
- // previous player state, not the latest
- Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2], -p->angles[0], p->angles[1], p->angles[2], 1);
- Matrix4x4_Invert_Simple(&imatrix, &matrix);
- Matrix4x4_Transform(&imatrix, b->start, b->relativestart);
- Matrix4x4_Transform(&imatrix, b->end, b->relativeend);
- b->relativestartvalid = 1;
- }
}
else
Con_Print("beam list overflow!\n");
}
+void CL_ParseBeam (model_t *m, int lightning)
+{
+ int ent;
+ vec3_t start, end;
+
+ ent = (unsigned short) MSG_ReadShort ();
+ MSG_ReadVector(start, cls.protocol);
+ MSG_ReadVector(end, cls.protocol);
+
+ if (ent >= MAX_EDICTS)
+ {
+ Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent);
+ ent = 0;
+ }
+
+ CL_NewBeam(ent, start, end, m, lightning);
+}
+
void CL_ParseTempEntity(void)
{
int type;
- vec3_t pos;
+ vec3_t pos, pos2;
+ vec3_t vel1, vel2;
vec3_t dir;
- vec3_t pos2;
vec3_t color;
int rnd;
int colorStart, colorLength, count;
// spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- //CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_RunParticleEffect(pos, vec3_origin, 20, 30);
+ CL_ParticleEffect(EFFECT_TE_WIZSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1);
break;
// spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- //CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_RunParticleEffect(pos, vec3_origin, 226, 20);
+ CL_ParticleEffect(EFFECT_TE_KNIGHTSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1);
break;
// spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 10);
- else if (cl_particles_bulletimpacts.integer)
- {
- CL_SparkShower(pos, vec3_origin, 15, 1, 0);
- CL_Smoke(pos, vec3_origin, 15, 0);
- }
- CL_BulletMark(pos);
+ CL_ParticleEffect(EFFECT_TE_SPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// super spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 20);
- else if (cl_particles_bulletimpacts.integer)
- {
- CL_SparkShower(pos, vec3_origin, 30, 1, 0);
- CL_Smoke(pos, vec3_origin, 30, 0);
- }
- CL_BulletMark(pos);
+ CL_ParticleEffect(EFFECT_TE_SUPERSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// rocket explosion
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_ParticleExplosion(pos);
- // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
CL_Effect(pos, cl.qw_modelindex_s_explod, 0, 6, 10);
break;
// tarbaby explosion
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_BlobExplosion(pos);
-
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_TAREXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case QW_TE_LIGHTNING1:
case QW_TE_LAVASPLASH:
MSG_ReadVector(pos, cls.protocol);
- CL_LavaSplash(pos);
+ CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case QW_TE_TELEPORT:
MSG_ReadVector(pos, cls.protocol);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_TeleportSplash(pos);
+ CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case QW_TE_GUNSHOT:
radius = MSG_ReadByte();
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 20*radius);
- else
- {
- CL_SparkShower(pos, vec3_origin, 15*radius, 1, radius);
- CL_Smoke(pos, vec3_origin, 15*radius, radius);
- }
- // TODO: scatter bullet marks throughout the sphere?
- CL_BulletMark(pos);
+ VectorSet(pos2, pos[0] + radius, pos[1] + radius, pos[2] + radius);
+ VectorSet(pos, pos[0] - radius, pos[1] - radius, pos[2] - radius);
+ CL_ParticleEffect(EFFECT_TE_GUNSHOT, radius, pos, pos2, vec3_origin, vec3_origin, NULL, 0);
break;
case QW_TE_BLOOD:
count = MSG_ReadByte();
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- CL_BloodPuff(pos, vec3_origin, 20*count);
+ CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case QW_TE_LIGHTNINGBLOOD:
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- CL_BloodPuff(pos, vec3_origin, 50);
+ CL_ParticleEffect(EFFECT_TE_BLOOD, 2.5, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
default:
// spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- //CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_RunParticleEffect(pos, vec3_origin, 20, 30);
+ CL_ParticleEffect(EFFECT_TE_WIZSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1);
break;
// spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- //CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_RunParticleEffect(pos, vec3_origin, 226, 20);
+ CL_ParticleEffect(EFFECT_TE_KNIGHTSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1);
break;
// spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 10);
- else if (cl_particles_bulletimpacts.integer)
- {
- CL_SparkShower(pos, vec3_origin, 15, 1, 0);
- CL_Smoke(pos, vec3_origin, 15, 0);
- }
- CL_BulletMark(pos);
+ CL_ParticleEffect(EFFECT_TE_SPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// quad spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 10);
- else if (cl_particles_bulletimpacts.integer)
- {
- CL_SparkShower(pos, vec3_origin, 15, 1, 0);
- CL_Smoke(pos, vec3_origin, 15, 0);
- }
- CL_BulletMark(pos);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_SPIKEQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// super spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 20);
- else if (cl_particles_bulletimpacts.integer)
- {
- CL_SparkShower(pos, vec3_origin, 30, 1, 0);
- CL_Smoke(pos, vec3_origin, 30, 0);
- }
- CL_BulletMark(pos);
+ CL_ParticleEffect(EFFECT_TE_SUPERSPIKE, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
// quad super spike hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 20);
- else if (cl_particles_bulletimpacts.integer)
- {
- CL_SparkShower(pos, vec3_origin, 30, 1, 0);
- CL_Smoke(pos, vec3_origin, 30, 0);
- }
- CL_BulletMark(pos);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_SUPERSPIKEQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
if (rand() % 5)
S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1);
else
dir[1] = MSG_ReadChar();
dir[2] = MSG_ReadChar();
count = MSG_ReadByte();
- CL_BloodPuff(pos, dir, count);
+ CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos, dir, dir, NULL, 0);
break;
case TE_SPARK:
// spark shower
dir[1] = MSG_ReadChar();
dir[2] = MSG_ReadChar();
count = MSG_ReadByte();
- CL_SparkShower(pos, dir, count, 1, 0);
+ CL_ParticleEffect(EFFECT_TE_SPARK, count, pos, pos, dir, dir, NULL, 0);
break;
case TE_PLASMABURN:
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 1, 1, 1, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_PlasmaBurn(pos);
+ CL_ParticleEffect(EFFECT_TE_PLASMABURN, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
// LordHavoc: added for improved gore
case TE_BLOODSHOWER:
MSG_ReadVector(pos2, cls.protocol); // maxs
velspeed = MSG_ReadCoord(cls.protocol); // speed
count = (unsigned short) MSG_ReadShort(); // number of particles
- CL_BloodShower(pos, pos2, velspeed, count);
+ vel1[0] = -velspeed;
+ vel1[1] = -velspeed;
+ vel1[2] = -velspeed;
+ vel2[0] = velspeed;
+ vel2[1] = velspeed;
+ vel2[2] = velspeed;
+ CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos2, vel1, vel2, NULL, 0);
break;
+
case TE_PARTICLECUBE:
// general purpose particle effect
MSG_ReadVector(pos, cls.protocol); // mins
colorStart = MSG_ReadByte(); // color
colorLength = MSG_ReadByte(); // gravity (1 or 0)
velspeed = MSG_ReadCoord(cls.protocol); // randomvel
- CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed);
+ CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength != 0, velspeed);
break;
case TE_PARTICLERAIN:
// bullet hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 20);
- else
- {
- CL_SparkShower(pos, vec3_origin, 15, 1, 0);
- CL_Smoke(pos, vec3_origin, 15, 0);
- }
- CL_BulletMark(pos);
+ CL_ParticleEffect(EFFECT_TE_GUNSHOT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case TE_GUNSHOTQUAD:
// quad bullet hitting wall
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 4);
- if (cl_particles_quake.integer)
- CL_RunParticleEffect(pos, vec3_origin, 0, 20);
- else
- {
- CL_SparkShower(pos, vec3_origin, 15, 1, 0);
- CL_Smoke(pos, vec3_origin, 15, 0);
- }
- CL_BulletMark(pos);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_GUNSHOTQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case TE_EXPLOSION:
// rocket explosion
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_ParticleExplosion(pos);
- // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_ParticleEffect(EFFECT_TE_EXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_EXPLOSIONQUAD:
// quad rocket explosion
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_ParticleExplosion(pos);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_ParticleEffect(EFFECT_TE_EXPLOSIONQUAD, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_EXPLOSION3:
// Nehahra movie colored lighting explosion
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_ParticleExplosion(pos);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
color[0] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
color[1] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
color[2] = MSG_ReadCoord(cls.protocol) * (2.0f / 1.0f);
- CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_ParticleExplosion(pos);
+ Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
+ CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_EXPLOSIONRGB:
color[1] = MSG_ReadByte() * (2.0f / 255.0f);
color[2] = MSG_ReadByte() * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_TAREXPLOSION:
// tarbaby explosion
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_BlobExplosion(pos);
-
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_TAREXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_SMALLFLASH:
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 2, 2, 2, 1000, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_SMALLFLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case TE_CUSTOMFLASH:
color[1] = MSG_ReadByte() * (2.0f / 255.0f);
color[2] = MSG_ReadByte() * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_AllocLightFlash(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, -1, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
break;
case TE_FLAMEJET:
MSG_ReadVector(pos, cls.protocol);
MSG_ReadVector(dir, cls.protocol);
count = MSG_ReadByte();
- CL_Flames(pos, dir, count);
+ CL_ParticleEffect(EFFECT_TE_FLAMEJET, count, pos, pos, dir, dir, NULL, 0);
break;
case TE_LIGHTNING1:
case TE_LAVASPLASH:
MSG_ReadVector(pos, cls.protocol);
- CL_LavaSplash(pos);
+ CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case TE_TELEPORT:
MSG_ReadVector(pos, cls.protocol);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 200, 1.0f, 1.0f, 1.0f, 600, 99.0f, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- CL_TeleportSplash(pos);
+ CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case TE_EXPLOSION2:
color[1] = tempcolor[1] * (2.0f / 255.0f);
color[2] = tempcolor[2] * (2.0f / 255.0f);
Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_AllocLightFlash(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_TEI_G3:
MSG_ReadVector(pos, cls.protocol);
MSG_ReadVector(pos2, cls.protocol);
MSG_ReadVector(dir, cls.protocol);
- CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1);
+ CL_ParticleEffect(EFFECT_TE_TEI_G3, 1, pos, pos2, dir, dir, NULL, 0);
break;
case TE_TEI_SMOKE:
MSG_ReadVector(dir, cls.protocol);
count = MSG_ReadByte();
CL_FindNonSolidLocation(pos, pos, 4);
- CL_Tei_Smoke(pos, dir, count);
+ CL_ParticleEffect(EFFECT_TE_TEI_SMOKE, count, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
case TE_TEI_BIGEXPLOSION:
MSG_ReadVector(pos, cls.protocol);
CL_FindNonSolidLocation(pos, pos, 10);
- CL_ParticleExplosion(pos);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
- if (gamemode != GAME_NEXUIZ)
- S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
+ CL_ParticleEffect(EFFECT_TE_TEI_BIGEXPLOSION, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0);
+ S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1);
break;
case TE_TEI_PLASMAHIT:
MSG_ReadVector(dir, cls.protocol);
count = MSG_ReadByte();
CL_FindNonSolidLocation(pos, pos, 5);
- CL_Tei_PlasmaHit(pos, dir, count);
- Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]);
- CL_AllocDlight(NULL, &tempmatrix, 500, 0.6, 1.2, 2.0f, 2000, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+ CL_ParticleEffect(EFFECT_TE_TEI_PLASMAHIT, count, pos, pos, vec3_origin, vec3_origin, NULL, 0);
break;
default:
}
}
+void CL_ParseTrailParticles(void)
+{
+ int entityindex;
+ int effectindex;
+ vec3_t start, end;
+ entityindex = (unsigned short)MSG_ReadShort();
+ if (entityindex >= MAX_EDICTS)
+ entityindex = 0;
+ if (entityindex >= cl.max_entities)
+ CL_ExpandEntities(entityindex);
+ effectindex = (unsigned short)MSG_ReadShort();
+ MSG_ReadVector(start, cls.protocol);
+ MSG_ReadVector(end, cls.protocol);
+ CL_ParticleEffect(effectindex, VectorDistance(start, end), start, end, vec3_origin, vec3_origin, entityindex > 0 ? cl.entities + entityindex : NULL, 0);
+}
+
+void CL_ParsePointParticles(void)
+{
+ int effectindex, count;
+ vec3_t origin, velocity;
+ effectindex = (unsigned short)MSG_ReadShort();
+ MSG_ReadVector(origin, cls.protocol);
+ MSG_ReadVector(velocity, cls.protocol);
+ count = (unsigned short)MSG_ReadShort();
+ CL_ParticleEffect(effectindex, count, origin, origin, velocity, velocity, NULL, 0);
+}
+
+// look for anything interesting like player IP addresses or ping reports
+qboolean CL_ExaminePrintString(const char *text)
+{
+ const char *t;
+ if (!strcmp(text, "Client ping times:\n"))
+ {
+ cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+ for(cl.parsingtextplayerindex = 0; cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0]; cl.parsingtextplayerindex++)
+ ;
+ if (cl.parsingtextplayerindex >= cl.maxclients) // should never happen, since the client itself should be in cl.scores
+ {
+ Con_Printf("ping reply but empty scoreboard?!?\n");
+ cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
+ cl.parsingtextexpectingpingforscores = 0;
+ }
+ cl.parsingtextexpectingpingforscores = cl.parsingtextexpectingpingforscores ? 2 : 0;
+ return !cl.parsingtextexpectingpingforscores;
+ }
+ if (!strncmp(text, "host: ", 9))
+ {
+ // cl.parsingtextexpectingpingforscores = false; // really?
+ cl.parsingtextmode = CL_PARSETEXTMODE_STATUS;
+ cl.parsingtextplayerindex = 0;
+ return true;
+ }
+ if (cl.parsingtextmode == CL_PARSETEXTMODE_PING)
+ {
+ // if anything goes wrong, we'll assume this is not a ping report
+ qboolean expected = cl.parsingtextexpectingpingforscores;
+ cl.parsingtextexpectingpingforscores = 0;
+ cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
+ t = text;
+ while (*t == ' ')
+ t++;
+ if ((*t >= '0' && *t <= '9') || *t == '-')
+ {
+ int ping = atoi(t);
+ while ((*t >= '0' && *t <= '9') || *t == '-')
+ t++;
+ if (*t == ' ')
+ {
+ int charindex = 0;
+ t++;
+ if(cl.parsingtextplayerindex < cl.maxclients)
+ {
+ for (charindex = 0;cl.scores[cl.parsingtextplayerindex].name[charindex] == t[charindex];charindex++)
+ ;
+ // note: the matching algorithm stops at the end of the player name because some servers append text such as " READY" after the player name in the scoreboard but not in the ping report
+ //if (cl.scores[cl.parsingtextplayerindex].name[charindex] == 0 && t[charindex] == '\n')
+ if (t[charindex] == '\n')
+ {
+ cl.scores[cl.parsingtextplayerindex].qw_ping = bound(0, ping, 9999);
+ for (cl.parsingtextplayerindex++;cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0];cl.parsingtextplayerindex++)
+ ;
+ //if (cl.parsingtextplayerindex < cl.maxclients) // we could still get unconnecteds!
+ {
+ // we parsed a valid ping entry, so expect another to follow
+ cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+ cl.parsingtextexpectingpingforscores = expected;
+ }
+ return !expected;
+ }
+ }
+ if (!strncmp(t, "unconnected\n", 12))
+ {
+ // just ignore
+ cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+ cl.parsingtextexpectingpingforscores = expected;
+ return !expected;
+ }
+ else
+ Con_DPrintf("player names '%s' and '%s' didn't match\n", cl.scores[cl.parsingtextplayerindex].name, t);
+ }
+ }
+ }
+ if (cl.parsingtextmode == CL_PARSETEXTMODE_STATUS)
+ {
+ if (!strncmp(text, "players: ", 9))
+ {
+ cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERID;
+ cl.parsingtextplayerindex = 0;
+ return true;
+ }
+ else if (!strstr(text, ": "))
+ {
+ cl.parsingtextmode = CL_PARSETEXTMODE_NONE; // status report ended
+ return true;
+ }
+ }
+ if (cl.parsingtextmode == CL_PARSETEXTMODE_STATUS_PLAYERID)
+ {
+ // if anything goes wrong, we'll assume this is not a status report
+ cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
+ if (text[0] == '#' && text[1] >= '0' && text[1] <= '9')
+ {
+ t = text + 1;
+ cl.parsingtextplayerindex = atoi(t);
+ while (*t >= '0' && *t <= '9')
+ t++;
+ if (*t == ' ')
+ {
+ cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERIP;
+ return true;
+ }
+ }
+ }
+ if (cl.parsingtextmode == CL_PARSETEXTMODE_STATUS_PLAYERIP)
+ {
+ // if anything goes wrong, we'll assume this is not a status report
+ cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
+ if (text[0] == ' ')
+ {
+ t = text;
+ while (*t == ' ')
+ t++;
+ // botclient is perfectly valid, but we don't care about bots
+ if (strcmp(t, "botclient\n"))
+ {
+ lhnetaddress_t address;
+ LHNETADDRESS_FromString(&address, t, 0);
+ // TODO: log the IP address and player name?
+ }
+ cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERID;
+ return true;
+ }
+ }
+ return true;
+}
+
+static void CL_NetworkTimeReceived(double newtime)
+{
+ if (cl_nolerp.integer || cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer))
+ cl.mtime[1] = cl.mtime[0] = newtime;
+ else
+ {
+ cl.mtime[1] = max(cl.mtime[0], newtime - 0.1);
+ cl.mtime[0] = newtime;
+ }
+ if (cl_nettimesyncmode.integer == 3)
+ cl.time = cl.mtime[1];
+ if (cl_nettimesyncmode.integer == 2)
+ {
+ if (cl.time < cl.mtime[1] || cl.time > cl.mtime[0])
+ cl.time = cl.mtime[1];
+ }
+ else if (cl_nettimesyncmode.integer == 1)
+ cl.time = cl.mtime[1];
+ // this packet probably contains a player entity update, so we will need
+ // to update the prediction
+ cl.movement_needupdate = true;
+ // this may get updated later in parsing by svc_clientdata
+ cl.onground = false;
+ // if true the cl.viewangles are interpolated from cl.mviewangles[]
+ // during this frame
+ // (makes spectating players much smoother and prevents mouse movement from turning)
+ cl.fixangle[1] = cl.fixangle[0];
+ cl.fixangle[0] = false;
+ if (!cls.demoplayback)
+ VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+}
+
#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x);
//[515]: csqc
void CL_VM_Parse_CenterPrint (const char *msg);
void CSQC_AddPrintText (const char *msg);
void CSQC_ReadEntities (void);
-//
-static unsigned char cgamenetbuffer[65536];
/*
=====================
cl.last_received_message = realtime;
+ if (cls.netcon && cls.signon < SIGNONS)
+ CL_KeepaliveMessage(false);
+
//
// if recording demos, copy the message out
//
else if (cl_shownet.integer == 2)
Con_Print("------------------\n");
- cl.onground = false; // unless the server says otherwise
//
// parse the message
//
if (cls.protocol == PROTOCOL_QUAKEWORLD)
{
- cl.mtime[1] = cl.mtime[0];
- cl.mtime[0] = realtime; // qw has no clock
- cl.movement_needupdate = true;
+ CL_NetworkTimeReceived(realtime); // qw has no clock
// slightly kill qw player entities each frame
for (i = 1;i < cl.maxclients;i++)
- cl_entities_active[i] = false;
+ cl.entities_active[i] = false;
// kill all qw nails
cl.qw_num_nails = 0;
// fade weapon view kick
- cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * cl.frametime, 0);
+ cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * bound(0, cl.time - cl.oldtime, 0.1), 0);
while (1)
{
{
char description[32*64], temp[64];
int count;
- strcpy(description, "packet dump: ");
+ strlcpy(description, "packet dump: ", sizeof(description));
i = cmdcount - 32;
if (i < 0)
i = 0;
case qw_svc_print:
i = MSG_ReadByte();
- if (i == 3) // chat
- CSQC_AddPrintText(va("\1%s", MSG_ReadString())); //[515]: csqc
- else
- CSQC_AddPrintText(MSG_ReadString());
+ temp = MSG_ReadString();
+ if (CL_ExaminePrintString(temp)) // look for anything interesting like player IP addresses or ping reports
+ {
+ if (i == 3) // chat
+ CSQC_AddPrintText(va("\1%s", temp)); //[515]: csqc
+ else
+ CSQC_AddPrintText(temp);
+ }
break;
case qw_svc_centerprint:
case qw_svc_setangle:
for (i=0 ; i<3 ; i++)
cl.viewangles[i] = MSG_ReadAngle (cls.protocol);
+ if (!cls.demoplayback)
+ {
+ cl.fixangle[0] = true;
+ VectorCopy(cl.viewangles, cl.mviewangles[0]);
+ // disable interpolation if this is new
+ if (!cl.fixangle[1])
+ VectorCopy(cl.viewangles, cl.mviewangles[1]);
+ }
break;
case qw_svc_lightstyle:
i = MSG_ReadByte ();
- if (i >= cl_max_lightstyle)
+ if (i >= cl.max_lightstyle)
{
Con_Printf ("svc_lightstyle >= MAX_LIGHTSTYLES");
break;
}
- strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map));
- cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
- cl_lightstyle[i].length = (int)strlen(cl_lightstyle[i].map);
+ strlcpy (cl.lightstyle[i].map, MSG_ReadString(), sizeof (cl.lightstyle[i].map));
+ cl.lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
+ cl.lightstyle[i].length = (int)strlen(cl.lightstyle[i].map);
break;
case qw_svc_sound:
if (i >= cl.maxclients)
Host_Error("CL_ParseServerMessage: svc_updateentertime >= cl.maxclients");
// seconds ago
- cl.scores[i].qw_entertime = realtime - MSG_ReadFloat();
+ cl.scores[i].qw_entertime = cl.time - MSG_ReadFloat();
break;
case qw_svc_spawnbaseline:
i = (unsigned short) MSG_ReadShort();
if (i < 0 || i >= MAX_EDICTS)
Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
- if (i >= cl_max_entities)
+ if (i >= cl.max_entities)
CL_ExpandEntities(i);
- CL_ParseBaseline(cl_entities + i, false);
+ CL_ParseBaseline(cl.entities + i, false);
break;
case qw_svc_spawnstatic:
CL_ParseStatic(false);
// NOTE: in QW this only worked on clients
if (i < 0 || i >= MAX_EDICTS)
Host_Error("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
- if (i >= cl_max_entities)
+ if (i >= cl.max_entities)
CL_ExpandEntities(i);
- cl_entities[i].persistent.muzzleflash = 1.0f;
+ cl.entities[i].persistent.muzzleflash = 1.0f;
break;
case qw_svc_updateuserinfo:
// fully kill the still slightly dead qw player entities each frame
for (i = 1;i < cl.maxclients;i++)
- if (!cl_entities_active[i])
- cl_entities[i].state_current.active = false;
-
- QW_CL_UpdateItemsAndWeapon();
+ if (!cl.entities_active[i])
+ cl.entities[i].state_current.active = false;
}
else
{
{
char description[32*64], temp[64];
int count;
- strcpy (description, "packet dump: ");
+ strlcpy (description, "packet dump: ", sizeof(description));
i = cmdcount - 32;
if (i < 0)
i = 0;
break;
case svc_time:
- cl.mtime[1] = cl.mtime[0];
- cl.mtime[0] = MSG_ReadFloat ();
- cl.movement_needupdate = true;
+ CL_NetworkTimeReceived(MSG_ReadFloat());
break;
case svc_clientdata:
break;
case svc_print:
- CSQC_AddPrintText(MSG_ReadString()); //[515]: csqc
+ temp = MSG_ReadString();
+ if (CL_ExaminePrintString(temp)) // look for anything interesting like player IP addresses or ping reports
+ CSQC_AddPrintText(temp); //[515]: csqc
break;
case svc_centerprint:
case svc_setangle:
for (i=0 ; i<3 ; i++)
cl.viewangles[i] = MSG_ReadAngle (cls.protocol);
+ if (!cls.demoplayback)
+ {
+ cl.fixangle[0] = true;
+ VectorCopy(cl.viewangles, cl.mviewangles[0]);
+ // disable interpolation if this is new
+ if (!cl.fixangle[1])
+ VectorCopy(cl.viewangles, cl.mviewangles[1]);
+ }
break;
case svc_setview:
cl.viewentity = (unsigned short)MSG_ReadShort ();
if (cl.viewentity >= MAX_EDICTS)
Host_Error("svc_setview >= MAX_EDICTS");
- if (cl.viewentity >= cl_max_entities)
+ if (cl.viewentity >= cl.max_entities)
CL_ExpandEntities(cl.viewentity);
// LordHavoc: assume first setview recieved is the real player entity
if (!cl.playerentity)
case svc_lightstyle:
i = MSG_ReadByte ();
- if (i >= cl_max_lightstyle)
+ if (i >= cl.max_lightstyle)
{
Con_Printf ("svc_lightstyle >= MAX_LIGHTSTYLES");
break;
}
- strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map));
- cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
- cl_lightstyle[i].length = (int)strlen(cl_lightstyle[i].map);
+ strlcpy (cl.lightstyle[i].map, MSG_ReadString(), sizeof (cl.lightstyle[i].map));
+ cl.lightstyle[i].map[MAX_STYLESTRING - 1] = 0;
+ cl.lightstyle[i].length = (int)strlen(cl.lightstyle[i].map);
break;
case svc_sound:
i = (unsigned short) MSG_ReadShort ();
if (i < 0 || i >= MAX_EDICTS)
Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i);
- if (i >= cl_max_entities)
+ if (i >= cl.max_entities)
CL_ExpandEntities(i);
- CL_ParseBaseline (cl_entities + i, false);
+ CL_ParseBaseline (cl.entities + i, false);
break;
case svc_spawnbaseline2:
i = (unsigned short) MSG_ReadShort ();
if (i < 0 || i >= MAX_EDICTS)
Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i);
- if (i >= cl_max_entities)
+ if (i >= cl.max_entities)
CL_ExpandEntities(i);
- CL_ParseBaseline (cl_entities + i, true);
+ CL_ParseBaseline (cl.entities + i, true);
break;
case svc_spawnstatic:
CL_ParseStatic (false);
case svc_skybox:
R_SetSkyBox(MSG_ReadString());
break;
- case svc_cgame:
- {
- int length;
- length = (int) ((unsigned short) MSG_ReadShort());
- for (i = 0;i < length;i++)
- cgamenetbuffer[i] = MSG_ReadByte();
- if (!msg_badread)
- CL_CGVM_ParseNetwork(cgamenetbuffer, length);
- }
- break;
case svc_entities:
if (cls.signon == SIGNONS - 1)
{
case svc_csqcentities:
CSQC_ReadEntities();
break;
+ case svc_downloaddata:
+ CL_ParseDownload();
+ break;
+ case svc_trailparticles:
+ CL_ParseTrailParticles();
+ break;
+ case svc_pointparticles:
+ CL_ParsePointParticles();
+ break;
}
}
}
+ if (cls.signon == SIGNONS)
+ CL_UpdateItemsAndWeapon();
+
EntityFrameQuake_ISeeDeadEntities();
parsingerror = false;
void CL_Parse_ErrorCleanUp(void)
{
- if (cls.qw_downloadmemory)
- {
- Mem_Free(cls.qw_downloadmemory);
- cls.qw_downloadmemory = NULL;
- }
- cls.qw_downloadpercent = 0;
+ CL_StopDownload(0, 0);
QW_CL_StopUpload();
}
Cvar_SetValue("demo_nehahra", 1);
Cvar_RegisterVariable(&developer_networkentities);
+ Cvar_RegisterVariable(&cl_sound_wizardhit);
+ Cvar_RegisterVariable(&cl_sound_hknighthit);
+ Cvar_RegisterVariable(&cl_sound_tink1);
+ Cvar_RegisterVariable(&cl_sound_ric1);
+ Cvar_RegisterVariable(&cl_sound_ric2);
+ Cvar_RegisterVariable(&cl_sound_ric3);
+ Cvar_RegisterVariable(&cl_sound_r_exp3);
+
+ Cvar_RegisterVariable(&cl_joinbeforedownloadsfinish);
+
+ // server extension cvars set by commands issued from the server during connect
+ Cvar_RegisterVariable(&cl_serverextension_download);
+
+ Cvar_RegisterVariable(&cl_nettimesyncmode);
+
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)");
Cmd_AddCommand("skins", QW_CL_Skins_f, "downloads missing qw skins from server");
Cmd_AddCommand("changing", QW_CL_Changing_f, "sent by qw servers to tell client to wait for level change");
+ Cmd_AddCommand("cl_begindownloads", CL_BeginDownloads_f, "used internally by darkplaces client while connecting (causes loading of models and sounds or triggers downloads for missing ones)");
+ Cmd_AddCommand("cl_downloadbegin", CL_DownloadBegin_f, "(networking) informs client of download file information, client replies with sv_startsoundload to begin the transfer");
+ Cmd_AddCommand("stopdownload", CL_StopDownload_f, "terminates a download");
+ Cmd_AddCommand("cl_downloadfinished", CL_DownloadFinished_f, "signals that a download has finished and provides the client with file size and crc to check its integrity");
}
void CL_Parse_Shutdown(void)