X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=eb33a388fdf413e19ef9e24485bd8ea5f7032b21;hb=3a12518a4f3897519c5578d154c597b8549b8dcf;hp=d7e0f0f6ec2e1229876b9813de2eddfc7413351c;hpb=9e279d8ea4a631713d98132cd1b01338e81f5c0b;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index d7e0f0f6..eb33a388 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "cdaudio.h" #include "cl_collision.h" #include "csprogs.h" +#include "libcurl.h" char *svc_strings[128] = { @@ -83,7 +84,7 @@ char *svc_strings[128] = "", // 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 @@ -157,6 +158,17 @@ char *qw_svc_strings[128] = 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"}; +cvar_t cl_iplog_name = {CVAR_SAVE, "cl_iplog_name", "darkplaces_iplog.txt", "name of iplog file containing player addresses for iplog_list command and automatic ip logging when parsing status command"}; static qboolean QW_CL_CheckOrDownloadFile(const char *filename); static void QW_CL_RequestNextDownload(void); @@ -257,7 +269,7 @@ so the server doesn't disconnect. */ static unsigned char olddata[NET_MAXMESSAGE]; -void CL_KeepaliveMessage (void) +void CL_KeepaliveMessage (qboolean readmessages) { float time; static double nextmsg = -1; @@ -269,18 +281,21 @@ void CL_KeepaliveMessage (void) 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) { @@ -293,7 +308,7 @@ void CL_KeepaliveMessage (void) 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); } } @@ -308,13 +323,13 @@ void CL_ParseEntityLump(char *entdata) 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 @@ -324,7 +339,7 @@ void CL_ParseEntityLump(char *entdata) 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)) @@ -334,15 +349,15 @@ void CL_ParseEntityLump(char *entdata) 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); } } @@ -384,10 +399,13 @@ static qboolean QW_CL_CheckOrDownloadFile(const char *filename) cls.qw_downloadnumber++; cls.qw_downloadpercent = 0; + cls.qw_downloadmemorycursize = 0; return false; } +extern void CL_Locs_Reload_f(void); +static void QW_CL_ProcessUserInfo(int slot); static void QW_CL_RequestNextDownload(void) { int i; @@ -400,7 +418,31 @@ static void QW_CL_RequestNextDownload(void) case dl_single: break; case dl_skin: - // TODO + if (cls.qw_downloadnumber == 0) + Con_Printf("Checking skins...\n"); + for (;cls.qw_downloadnumber < cl.maxclients;cls.qw_downloadnumber++) + { + if (!cl.scores[cls.qw_downloadnumber].name[0]) + continue; + // check if we need to download the file, and return if so + if (!QW_CL_CheckOrDownloadFile(va("skins/%s.pcx", cl.scores[cls.qw_downloadnumber].qw_skin))) + return; + } + + cls.qw_downloadtype = dl_none; + + // load any newly downloaded skins + for (i = 0;i < cl.maxclients;i++) + QW_CL_ProcessUserInfo(i); + + // if we're still in signon stages, request the next one + if (cls.signon != SIGNONS) + { + cls.signon = SIGNONS-1; + // we'll go to SIGNONS when the first entity update is received + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("begin %i", cl.qw_servercount)); + } break; case dl_model: if (cls.qw_downloadnumber == 0) @@ -409,7 +451,6 @@ static void QW_CL_RequestNextDownload(void) cls.qw_downloadnumber = 1; } - cls.qw_downloadtype = dl_model; for (;cls.qw_downloadnumber < MAX_MODELS && cl.model_name[cls.qw_downloadnumber][0];cls.qw_downloadnumber++) { // skip submodels @@ -428,6 +469,8 @@ static void QW_CL_RequestNextDownload(void) return; } + cls.qw_downloadtype = dl_none; + // touch all of the precached models that are still loaded so we can free // anything that isn't needed Mod_ClearUsed(); @@ -452,15 +495,35 @@ static void QW_CL_RequestNextDownload(void) if ((cl.model_precache[i] = Mod_ForName(cl.model_name[i], false, false, false))->Draw == NULL) Con_Printf("Model %s could not be found or downloaded\n", cl.model_name[i]); + // check memory integrity + Mem_CheckSentinelsGlobal(); + + // 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_UpdateRenderEntity(&cl.entities[0].render); + + CL_Locs_Reload_f(); + R_Modules_NewMap(); + + cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav"); + + // add pmodel/emodel CRCs to userinfo + CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true); + CL_SetInfo("emodel", va("%i", FS_CRCFile("progs/eyes.mdl", NULL)), true, true, true, true); + // done checking sounds and models, send a prespawn command now MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); - MSG_WriteString(&cls.netcon->message, va("prespawn %i 0 %i", cl.qw_servercount, cl.worldmodel ? cl.worldmodel->brush.qw_md4sum2 : 0)); + MSG_WriteString(&cls.netcon->message, va("prespawn %i 0 %i", cl.qw_servercount, cl.model_precache[1]->brush.qw_md4sum2)); if (cls.qw_downloadmemory) { Mem_Free(cls.qw_downloadmemory); cls.qw_downloadmemory = NULL; } + + // done loading + cl.loadfinished = true; break; case dl_sound: if (cls.qw_downloadnumber == 0) @@ -469,29 +532,27 @@ static void QW_CL_RequestNextDownload(void) cls.qw_downloadnumber = 1; } - cls.qw_downloadtype = dl_sound; for (;cl.sound_name[cls.qw_downloadnumber][0];cls.qw_downloadnumber++) { - // skip subsounds - if (cl.sound_name[cls.qw_downloadnumber][0] == '*') - continue; // check if we need to download the file, and return if so if (!QW_CL_CheckOrDownloadFile(va("sound/%s", cl.sound_name[cls.qw_downloadnumber]))) return; } + cls.qw_downloadtype = dl_none; + // load new sounds and unload old ones // FIXME: S_ServerSounds does not know about cl.sfx_ sounds 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++) @@ -500,6 +561,9 @@ static void QW_CL_RequestNextDownload(void) cl.sound_precache[i] = S_PrecacheSound(cl.sound_name[i], true, false); } + // check memory integrity + Mem_CheckSentinelsGlobal(); + // done with sound downloads, next we check models MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); MSG_WriteString(&cls.netcon->message, va("modellist %i %i", cl.qw_servercount, 0)); @@ -512,9 +576,11 @@ static void QW_CL_RequestNextDownload(void) static void QW_CL_ParseDownload(void) { - int size = MSG_ReadShort(); + int size = (signed short)MSG_ReadShort(); int percent = MSG_ReadByte(); + //Con_Printf("download %i %i%% (%i/%i)\n", size, percent, cls.qw_downloadmemorycursize, cls.qw_downloadmemorymaxsize); + // skip the download fragment if playing a demo if (!cls.netcon) { @@ -540,7 +606,7 @@ static void QW_CL_ParseDownload(void) 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); @@ -551,6 +617,7 @@ static void QW_CL_ParseDownload(void) // 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; @@ -590,7 +657,7 @@ static void QW_CL_ParseModelList(void) 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])); } @@ -602,6 +669,7 @@ static void QW_CL_ParseModelList(void) return; } + cls.signon = 2; cls.qw_downloadnumber = 0; cls.qw_downloadtype = dl_model; QW_CL_RequestNextDownload(); @@ -623,7 +691,7 @@ static void QW_CL_ParseSoundList(void) 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])); } @@ -636,11 +704,30 @@ static void QW_CL_ParseSoundList(void) return; } + cls.signon = 2; cls.qw_downloadnumber = 0; cls.qw_downloadtype = dl_sound; QW_CL_RequestNextDownload(); } +static void QW_CL_Skins_f(void) +{ + cls.qw_downloadnumber = 0; + cls.qw_downloadtype = dl_skin; + QW_CL_RequestNextDownload(); +} + +static void QW_CL_Changing_f(void) +{ + if (cls.qw_downloadmemory) // don't change when downloading + return; + + S_StopAllSounds(); + cl.intermission = 0; + cls.signon = 1; // not active anymore, but not disconnected + Con_Printf("\nChanging map...\n"); +} + void QW_CL_NextUpload(void) { int r, percent, size; @@ -682,7 +769,7 @@ void QW_CL_StartUpload(unsigned char *data, int size) 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; @@ -716,9 +803,11 @@ static void QW_CL_ProcessUserInfo(int slot) cl.scores[slot].colors = topcolor * 16 + bottomcolor; InfoString_GetValue(cl.scores[slot].qw_userinfo, "*spectator", temp, sizeof(temp)); cl.scores[slot].qw_spectator = temp[0] != 0; + InfoString_GetValue(cl.scores[slot].qw_userinfo, "team", cl.scores[slot].qw_team, sizeof(cl.scores[slot].qw_team)); InfoString_GetValue(cl.scores[slot].qw_userinfo, "skin", cl.scores[slot].qw_skin, sizeof(cl.scores[slot].qw_skin)); - // LordHavoc: abusing Draw_CachePic for caching skins... - cl.scores[slot].qw_skin_cachepic = Draw_CachePic(cl.scores[slot].qw_skin, true); + if (!cl.scores[slot].qw_skin[0]) + strlcpy(cl.scores[slot].qw_skin, "base", sizeof(cl.scores[slot].qw_skin)); + // TODO: skin cache } static void QW_CL_UpdateUserInfo(void) @@ -760,10 +849,13 @@ static void QW_CL_ServerInfo(void) { char key[2048]; char value[2048]; + char temp[32]; strlcpy(key, MSG_ReadString(), sizeof(key)); strlcpy(value, MSG_ReadString(), sizeof(value)); Con_DPrintf("SERVERINFO: %s=%s\n", key, value); InfoString_SetValue(cl.qw_serverinfo, sizeof(cl.qw_serverinfo), key, value); + InfoString_GetValue(cl.qw_serverinfo, "teamplay", temp, sizeof(temp)); + cl.qw_teamplay = atoi(temp); } static void QW_CL_ParseNails(void) @@ -772,22 +864,23 @@ static void QW_CL_ParseNails(void) int numnails = MSG_ReadByte(); vec_t *v; unsigned char bits[6]; - cl.qw_num_nails = 0; for (i = 0;i < numnails;i++) { - v = cl.qw_nails[cl.qw_num_nails++]; for (j = 0;j < 6;j++) bits[j] = MSG_ReadByte(); + if (cl.qw_num_nails > 255) + continue; + v = cl.qw_nails[cl.qw_num_nails++]; v[0] = ( ( bits[0] + ((bits[1]&15)<<8) ) <<1) - 4096; v[1] = ( ( (bits[1]>>4) + (bits[2]<<4) ) <<1) - 4096; v[2] = ( ( bits[3] + ((bits[4]&15)<<8) ) <<1) - 4096; - v[3] = 360*(bits[4]>>4)/16; + v[3] = -360*(bits[4]>>4)/16; v[4] = 360*bits[5]/256; v[5] = 0; } } -static void QW_CL_UpdateItemsAndWeapon(void) +static void CL_UpdateItemsAndWeapon(void) { int j; // check for important changes @@ -805,6 +898,387 @@ static void QW_CL_UpdateItemsAndWeapon(void) cl.activeweapon = cl.stats[STAT_ACTIVEWEAPON]; } +void CL_BeginDownloads(qboolean aborteddownload) +{ + // quakeworld works differently + if (cls.protocol == PROTOCOL_QUAKEWORLD) + return; + + // this would be a good place to do curl downloads + if(Curl_Have_forthismap()) + { + Curl_Register_predownload(); // come back later + return; + } + + // if we got here... + // curl is done, so let's start with the business + cl.loadbegun = true; + + // if already downloading something from the previous level, don't stop it + if (cls.qw_downloadname[0]) + return; + + 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); + CL_Locs_Reload_f(); + R_Modules_NewMap(); + cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav"); + // check memory integrity + Mem_CheckSentinelsGlobal(); + if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer) + { + cl.loadfinished = true; + // now issue the spawn to move on to signon 2 like normal + if (cls.netcon) + Cmd_ForwardStringToServer("prespawn"); + } + } + } + + // 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); + CL_Locs_Reload_f(); + R_Modules_NewMap(); + cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav"); + // check memory integrity + Mem_CheckSentinelsGlobal(); + if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer) + { + cl.loadfinished = true; + // now issue the spawn to move on to signon 2 like normal + if (cls.netcon) + Cmd_ForwardStringToServer("prespawn"); + } + } + 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); + CL_Locs_Reload_f(); + R_Modules_NewMap(); + cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav"); + // check memory integrity + Mem_CheckSentinelsGlobal(); + if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer) + { + cl.loadfinished = true; + // now issue the spawn to move on to signon 2 like normal + if (cls.netcon) + Cmd_ForwardStringToServer("prespawn"); + } + } + } + + // 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 2 like normal + if (cls.netcon) + Cmd_ForwardStringToServer("prespawn"); + } +} + +void CL_BeginDownloads_f(void) +{ + // prevent cl_begindownloads from being issued multiple times in one match + // to prevent accidentally cancelled downloads + if(cl.loadbegun) + Con_DPrintf("cl_begindownloads is only valid once per match\n"); + else + 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); +} + +static void CL_SendPlayerInfo(void) +{ + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("name \"%s\"", cl_name.string)); + + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15)); + + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer)); + + if (cl_pmodel.integer) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("pmodel %i", cl_pmodel.integer)); + } + if (*cl_playermodel.string) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("playermodel %s", cl_playermodel.string)); + } + if (*cl_playerskin.string) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, va("playerskin %s", cl_playerskin.string)); + } +} + /* ===================== CL_SignonReply @@ -821,39 +1295,30 @@ static void CL_SignonReply (void) case 1: if (cls.netcon) { - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, "prespawn"); + // send player info before we begin downloads + // (so that the server can see the player name while downloading) + CL_SendPlayerInfo(); + + // execute cl_begindownloads next frame + // (after any commands added by svc_stufftext have been executed) + // when done with downloads the "prespawn" will be sent + Cbuf_AddText("\ncl_begindownloads\n"); + + //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: if (cls.netcon) { - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, va("name \"%s\"", cl_name.string)); - - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15)); - - if (cl_pmodel.integer) - { - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, va("pmodel %i", cl_pmodel.integer)); - } - if (*cl_playermodel.string) - { - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, va("playermodel %s", cl_playermodel.string)); - } - if (*cl_playerskin.string) - { - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, va("playerskin %s", cl_playerskin.string)); - } - - MSG_WriteByte (&cls.netcon->message, clc_stringcmd); - MSG_WriteString (&cls.netcon->message, va("rate %i", cl_rate.integer)); + // LordHavoc: quake sent the player info here but due to downloads + // it is sent earlier instead + // CL_SendPlayerInfo(); + // 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"); } @@ -884,13 +1349,19 @@ void CL_ParseServerInfo (void) int i; protocolversion_t protocol; int nummodels, numsounds; - entity_t *ent; Con_DPrint("Serverinfo packet received.\n"); + // if server is active, we already began a loading plaque + if (!sv.active) + SCR_BeginLoadingPlaque(); + // check memory integrity Mem_CheckSentinelsGlobal(); + // clear cl_serverextension cvars + Cvar_SetValueQuick(&cl_serverextension_download, 0); + // // wipe the client_state_t struct // @@ -910,36 +1381,31 @@ void CL_ParseServerInfo (void) cls.protocol = protocol; Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cls.protocol)); + 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 (); @@ -963,23 +1429,21 @@ void CL_ParseServerInfo (void) // check memory integrity Mem_CheckSentinelsGlobal(); - S_StopAllSounds(); - // if server is active, we already began a loading plaque - if (!sv.active) - SCR_BeginLoadingPlaque(); - - // disable until we get textures for it - R_ResetSkyBox(); - - memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache)); //[515]: csqc - memset(cl.model_precache, 0, sizeof(cl.model_precache)); - memset(cl.sound_precache, 0, sizeof(cl.sound_precache)); + if (cls.netcon) + { + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0)); + } - MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); - MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0)); + cl.loadbegun = false; + cl.loadfinished = false; cls.state = ca_connected; cls.signon = 1; + + // note: on QW protocol we can't set up the gameworld until after + // downloads finish... + // (we don't even know the name of the map yet) } else { @@ -990,7 +1454,7 @@ void CL_ParseServerInfo (void) 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 (); @@ -1006,18 +1470,6 @@ void CL_ParseServerInfo (void) // check memory integrity Mem_CheckSentinelsGlobal(); - S_StopAllSounds(); - // if server is active, we already began a loading plaque - if (!sv.active) - SCR_BeginLoadingPlaque(); - - // disable until we get textures for it - R_ResetSkyBox(); - - memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache)); //[515]: csqc - memset(cl.model_precache, 0, sizeof(cl.model_precache)); - memset(cl.sound_precache, 0, sizeof(cl.sound_precache)); - // parse model precache list for (nummodels=1 ; ; nummodels++) { @@ -1027,7 +1479,7 @@ void CL_ParseServerInfo (void) 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 @@ -1039,7 +1491,7 @@ void CL_ParseServerInfo (void) 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])); } @@ -1060,63 +1512,59 @@ void CL_ParseServerInfo (void) 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 + 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.loadbegun = false; + cl.loadfinished = false; + } - // 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]); + // check memory integrity + Mem_CheckSentinelsGlobal(); - // normal models - for (i=2 ; iDraw == NULL) - Con_Printf("Model %s not found\n", cl.model_name[i]); - } +// if cl_autodemo is set, automatically start recording a demo if one isn't being recorded already + if (cl_autodemo.integer && cls.netcon && cls.protocol != PROTOCOL_QUAKEWORLD) + { + char demofile[MAX_OSPATH]; + char levelname[MAX_QPATH]; - // sounds - for (i=1 ; istate_current.active = true; - ent->render.model = cl.worldmodel = cl.model_precache[1]; - ent->render.scale = 1; // some of the renderer still relies on scale - ent->render.alpha = 1; - ent->render.colormap = -1; // no special coloring - ent->render.flags = RENDER_SHADOW | RENDER_LIGHT; - Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1); - Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); - CL_BoundingBoxForEntity(&ent->render); - - cl_num_entities = 1; - R_Modules_NewMap(); - CL_CGVM_Start(); + // start a new demo file + strlcpy(levelname, FS_FileWithoutPath(cl.model_name[1]), sizeof(levelname)); + if (strrchr(levelname, '.')) + *(strrchr(levelname, '.')) = 0; + dpsnprintf (demofile, sizeof(demofile), "%s_%s.dem", Sys_TimeString (cl_autodemo_nameformat.string), levelname); - // noclip is turned off at start - noclip_anglehack = false; + Con_Printf ("Auto-recording to %s.\n", demofile); - // check memory integrity - Mem_CheckSentinelsGlobal(); + cls.demofile = FS_Open (demofile, "wb", false, false); + if (cls.demofile) + { + cls.forcetrack = -1; + FS_Printf (cls.demofile, "%i\n", cls.forcetrack); + cls.demorecording = true; + } + else + Con_Print ("ERROR: couldn't open.\n"); + } } void CL_ValidateState(entity_state_t *s) @@ -1126,7 +1574,7 @@ void CL_ValidateState(entity_state_t *s) 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 @@ -1172,9 +1620,11 @@ void CL_MoveLerpEntityStates(entity_t *ent) 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 (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); @@ -1209,6 +1659,9 @@ void CL_MoveLerpEntityStates(entity_t *ent) 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; } /* @@ -1240,7 +1693,6 @@ void CL_ParseBaseline (entity_t *ent, int large) 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; } @@ -1254,7 +1706,7 @@ Server information pertaining to this client only */ 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]); @@ -1321,7 +1773,6 @@ void CL_ParseClientdata (void) 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) @@ -1362,20 +1813,6 @@ void CL_ParseClientdata (void) 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<= 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); + if (ent->state_baseline.modelindex == 0) + { + Con_DPrintf("svc_parsestatic: static entity without model at %f %f %f\n", ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2]); + cl.num_static_entities--; + // This is definitely a cheesy way to conserve resources... + return; + } + // copy it to the current state ent->render.model = cl.model_precache[ent->state_baseline.modelindex]; ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame; @@ -1404,18 +1849,12 @@ void CL_ParseStatic (int large) 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); - - // This is definitely cheating... - if (ent->render.model == NULL) - cl_num_static_entities--; + CL_UpdateRenderEntity(&ent->render); } /* @@ -1467,77 +1906,69 @@ void CL_ParseEffect2 (void) 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; @@ -1554,9 +1985,7 @@ void CL_ParseTempEntity(void) // 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; @@ -1564,9 +1993,7 @@ void CL_ParseTempEntity(void) // 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; @@ -1574,14 +2001,7 @@ void CL_ParseTempEntity(void) // 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 @@ -1599,14 +2019,7 @@ void CL_ParseTempEntity(void) // 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 @@ -1625,12 +2038,8 @@ void CL_ParseTempEntity(void) // 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; @@ -1638,12 +2047,8 @@ void CL_ParseTempEntity(void) // 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: @@ -1663,14 +2068,12 @@ void CL_ParseTempEntity(void) 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: @@ -1678,28 +2081,22 @@ void CL_ParseTempEntity(void) 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: @@ -1715,9 +2112,7 @@ void CL_ParseTempEntity(void) // 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; @@ -1725,9 +2120,7 @@ void CL_ParseTempEntity(void) // 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; @@ -1735,14 +2128,7 @@ void CL_ParseTempEntity(void) // 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 @@ -1760,16 +2146,7 @@ void CL_ParseTempEntity(void) // 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 @@ -1787,14 +2164,7 @@ void CL_ParseTempEntity(void) // 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 @@ -1812,16 +2182,7 @@ void CL_ParseTempEntity(void) // 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 @@ -1844,7 +2205,7 @@ void CL_ParseTempEntity(void) 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 @@ -1854,14 +2215,12 @@ void CL_ParseTempEntity(void) 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: @@ -1870,8 +2229,15 @@ void CL_ParseTempEntity(void) 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 @@ -1881,7 +2247,7 @@ void CL_ParseTempEntity(void) 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: @@ -1908,67 +2274,43 @@ void CL_ParseTempEntity(void) // 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: @@ -1980,28 +2322,22 @@ void CL_ParseTempEntity(void) 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: @@ -2013,14 +2349,14 @@ void CL_ParseTempEntity(void) 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: @@ -2052,14 +2388,12 @@ void CL_ParseTempEntity(void) 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: @@ -2074,16 +2408,15 @@ void CL_ParseTempEntity(void) 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: @@ -2091,17 +2424,14 @@ void CL_ParseTempEntity(void) 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: @@ -2109,9 +2439,7 @@ void CL_ParseTempEntity(void) 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: @@ -2120,6 +2448,360 @@ void CL_ParseTempEntity(void) } } +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); +} + +typedef struct cl_iplog_item_s +{ + char *address; + char *name; +} +cl_iplog_item_t; + +static qboolean cl_iplog_loaded = false; +static int cl_iplog_numitems = 0; +static int cl_iplog_maxitems = 0; +static cl_iplog_item_t *cl_iplog_items; + +static void CL_IPLog_Load(void); +static void CL_IPLog_Add(const char *address, const char *name, qboolean checkexisting, qboolean addtofile) +{ + int i; + if (!address || !address[0] || !name || !name[0]) + return; + if (!cl_iplog_loaded) + CL_IPLog_Load(); + if (developer.integer >= 100) + Con_Printf("CL_IPLog_Add(\"%s\", \"%s\", %i, %i);\n", address, name, checkexisting, addtofile); + // see if it already exists + if (checkexisting) + { + for (i = 0;i < cl_iplog_numitems;i++) + { + if (!strcmp(cl_iplog_items[i].address, address) && !strcmp(cl_iplog_items[i].name, name)) + { + if (developer.integer >= 100) + Con_Printf("... found existing \"%s\" \"%s\"\n", cl_iplog_items[i].address, cl_iplog_items[i].name); + return; + } + } + } + // it does not already exist in the iplog, so add it + if (cl_iplog_maxitems <= cl_iplog_numitems || !cl_iplog_items) + { + cl_iplog_item_t *olditems = cl_iplog_items; + cl_iplog_maxitems = max(1024, cl_iplog_maxitems + 256); + cl_iplog_items = Mem_Alloc(cls.permanentmempool, cl_iplog_maxitems * sizeof(cl_iplog_item_t)); + if (olditems) + { + if (cl_iplog_numitems) + memcpy(cl_iplog_items, olditems, cl_iplog_numitems * sizeof(cl_iplog_item_t)); + Mem_Free(olditems); + } + } + cl_iplog_items[cl_iplog_numitems].address = Mem_Alloc(cls.permanentmempool, strlen(address) + 1); + cl_iplog_items[cl_iplog_numitems].name = Mem_Alloc(cls.permanentmempool, strlen(name) + 1); + strlcpy(cl_iplog_items[cl_iplog_numitems].address, address, strlen(address) + 1); + // TODO: maybe it would be better to strip weird characters from name when + // copying it here rather than using a straight strcpy? + strlcpy(cl_iplog_items[cl_iplog_numitems].name, name, strlen(name) + 1); + cl_iplog_numitems++; + if (addtofile) + { + // add it to the iplog.txt file + // TODO: this ought to open the one in the userpath version of the base + // gamedir, not the current gamedir + Log_Printf(cl_iplog_name.string, "%s %s\n", address, name); + if (developer.integer >= 100) + Con_Printf("CL_IPLog_Add: appending this line to %s: %s %s\n", cl_iplog_name.string, address, name); + } +} + +static void CL_IPLog_Load(void) +{ + int i, len, linenumber; + char *text, *textend; + unsigned char *filedata; + fs_offset_t filesize; + char line[MAX_INPUTLINE]; + char address[MAX_INPUTLINE]; + cl_iplog_loaded = true; + // TODO: this ought to open the one in the userpath version of the base + // gamedir, not the current gamedir + filedata = FS_LoadFile(cl_iplog_name.string, tempmempool, true, &filesize); + if (!filedata) + return; + text = (char *)filedata; + textend = text + filesize; + for (linenumber = 1;text < textend;linenumber++) + { + for (len = 0;text < textend && *text != '\r' && *text != '\n';text++) + if (len < (int)sizeof(line) - 1) + line[len++] = *text; + line[len] = 0; + if (text < textend && *text == '\r' && text[1] == '\n') + text++; + if (text < textend && *text == '\n') + text++; + if (line[0] == '/' && line[1] == '/') + continue; // skip comments if anyone happens to add them + for (i = 0;i < len && line[i] > ' ';i++) + address[i] = line[i]; + address[i] = 0; + // skip exactly one space character + i++; + // address contains the address with termination, + // line + i contains the name with termination + if (address[0] && line[i]) + CL_IPLog_Add(address, line + i, false, false); + else + Con_Printf("%s:%i: could not parse address and name:\n%s\n", cl_iplog_name.string, linenumber, line); + } +} + +static void CL_IPLog_List_f(void) +{ + int i, j; + const char *addressprefix; + if (Cmd_Argc() > 2) + { + Con_Printf("usage: %s 123.456.789.\n", Cmd_Argv(0)); + return; + } + addressprefix = ""; + if (Cmd_Argc() >= 2) + addressprefix = Cmd_Argv(1); + if (!cl_iplog_loaded) + CL_IPLog_Load(); + if (addressprefix && addressprefix[0]) + Con_Printf("Listing iplog addresses beginning with %s\n", addressprefix); + else + Con_Printf("Listing all iplog entries\n"); + Con_Printf("address name\n"); + for (i = 0;i < cl_iplog_numitems;i++) + { + if (addressprefix && addressprefix[0]) + { + for (j = 0;addressprefix[j];j++) + if (addressprefix[j] != cl_iplog_items[i].address[j]) + break; + // if this address does not begin with the addressprefix string + // simply omit it from the output + if (addressprefix[j]) + continue; + } + // if name is less than 15 characters, left justify it and pad + // if name is more than 15 characters, print all of it, not worrying + // about the fact it will misalign the columns + if (strlen(cl_iplog_items[i].address) < 15) + Con_Printf("%-15s %s\n", cl_iplog_items[i].address, cl_iplog_items[i].name); + else + Con_Printf("%5s %s\n", cl_iplog_items[i].address, cl_iplog_items[i].name); + } +} + +// look for anything interesting like player IP addresses or ping reports +qboolean CL_ExaminePrintString(const char *text) +{ + int len; + const char *t; + char temp[MAX_INPUTLINE]; + 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) - 1; + while (*t >= '0' && *t <= '9') + t++; + if (*t == ' ') + { + cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERIP; + return true; + } + // the player name follows here, along with frags and time + } + } + 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++; + for (len = 0;*t && *t != '\n';t++) + if (len < (int)sizeof(temp) - 1) + temp[len++] = *t; + temp[len] = 0; + // botclient is perfectly valid, but we don't care about bots + // also don't try to look up the name of an invalid player index + if (strcmp(temp, "botclient") + && cl.parsingtextplayerindex >= 0 + && cl.parsingtextplayerindex < cl.maxclients + && cl.scores[cl.parsingtextplayerindex].name[0]) + { + // log the player name and IP address string + // (this operates entirely on strings to avoid issues with the + // nature of a network address) + CL_IPLog_Add(temp, cl.scores[cl.parsingtextplayerindex].name, true, true); + } + cl.parsingtextmode = CL_PARSETEXTMODE_STATUS_PLAYERID; + return true; + } + } + return true; +} + +static void CL_NetworkTimeReceived(double newtime) +{ + if (cls.timedemo || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) || cl.mtime[0] == newtime || cls.signon < SIGNONS) + cl.time = cl.mtime[1] = cl.mtime[0] = newtime; + else + { + cl.mtime[1] = max(cl.mtime[0], newtime - 0.1); + cl.mtime[0] = newtime; + if (developer.integer >= 10) + { + if (cl.time < cl.mtime[1] - (cl.mtime[0] - cl.mtime[1])) + Con_Printf("--- cl.time < cl.mtime[1] (%f < %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]); + else if (cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1])) + Con_Printf("--- cl.time > cl.mtime[0] (%f > %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]); + } + if (cl_nettimesyncmode.integer == 2) + { + if (cl.time < cl.mtime[1] || cl.time > cl.mtime[0] + (cl.mtime[0] - cl.mtime[1])) + cl.time = cl.mtime[1]; + } + else if (cl_nettimesyncmode.integer) + 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 @@ -2129,8 +2811,6 @@ void CL_VM_Parse_StuffCmd (const char *msg); void CL_VM_Parse_CenterPrint (const char *msg); void CSQC_AddPrintText (const char *msg); void CSQC_ReadEntities (void); -// -static unsigned char cgamenetbuffer[65536]; /* ===================== @@ -2147,11 +2827,17 @@ void CL_ParseServerMessage(void) char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; - if (cls.demorecording) - CL_WriteDemoMessage (); + // LordHavoc: moved demo message writing from before the packet parse to + // after the packet parse so that CL_Stop_f can be called by cl_autodemo + // code in CL_ParseServerinfo + //if (cls.demorecording) + // CL_WriteDemoMessage (&net_message); cl.last_received_message = realtime; + if (cls.netcon && cls.signon < SIGNONS) + CL_KeepaliveMessage(false); + // // if recording demos, copy the message out // @@ -2160,7 +2846,6 @@ void CL_ParseServerMessage(void) else if (cl_shownet.integer == 2) Con_Print("------------------\n"); - cl.onground = false; // unless the server says otherwise // // parse the message // @@ -2170,8 +2855,17 @@ void CL_ParseServerMessage(void) if (cls.protocol == PROTOCOL_QUAKEWORLD) { - cl.mtime[1] = cl.mtime[0]; - cl.mtime[0] = realtime; // qw has no clock + 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; + + // kill all qw nails + cl.qw_num_nails = 0; + + // fade weapon view kick + cl.qw_weaponkick = min(cl.qw_weaponkick + 10 * bound(0, cl.time - cl.oldtime, 0.1), 0); while (1) { @@ -2206,7 +2900,7 @@ void CL_ParseServerMessage(void) { 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; @@ -2236,14 +2930,18 @@ void CL_ParseServerMessage(void) CL_NextDemo(); else CL_Disconnect(); - break; + return; 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: @@ -2268,18 +2966,26 @@ void CL_ParseServerMessage(void) 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: @@ -2317,16 +3023,16 @@ void CL_ParseServerMessage(void) 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); @@ -2389,10 +3095,10 @@ void CL_ParseServerMessage(void) break; case qw_svc_smallkick: - Con_Printf("TODO: qw_svc_smallkick\n"); + cl.qw_weaponkick = -2; break; case qw_svc_bigkick: - Con_Printf("TODO: qw_svc_bigkick\n"); + cl.qw_weaponkick = -4; break; case qw_svc_muzzleflash: @@ -2400,9 +3106,9 @@ void CL_ParseServerMessage(void) // 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: @@ -2476,7 +3182,11 @@ void CL_ParseServerMessage(void) break; } } - QW_CL_UpdateItemsAndWeapon(); + + // 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; } else { @@ -2530,7 +3240,7 @@ void CL_ParseServerMessage(void) { 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; @@ -2556,9 +3266,7 @@ void CL_ParseServerMessage(void) 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: @@ -2585,7 +3293,9 @@ void CL_ParseServerMessage(void) 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: @@ -2608,13 +3318,21 @@ void CL_ParseServerMessage(void) 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) @@ -2623,14 +3341,14 @@ void CL_ParseServerMessage(void) 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: @@ -2653,7 +3371,7 @@ void CL_ParseServerMessage(void) { model_t *model = Mod_ForName(s, false, false, i == 1); if (!model) - Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s); + Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s); cl.model_precache[i] = model; } else @@ -2666,7 +3384,7 @@ void CL_ParseServerMessage(void) { sfx_t *sfx = S_PrecacheSound (s, true, false); if (!sfx && snd_initialized.integer) - Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s); + Con_DPrintf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s); cl.sound_precache[i] = sfx; } else @@ -2717,17 +3435,17 @@ void CL_ParseServerMessage(void) 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); @@ -2852,16 +3570,6 @@ void CL_ParseServerMessage(void) 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) { @@ -2879,13 +3587,30 @@ void CL_ParseServerMessage(void) 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; + + // LordHavoc: this was at the start of the function before cl_autodemo was + // implemented + if (cls.demorecording) + CL_WriteDemoMessage (&net_message); } void CL_Parse_DumpPacket(void) @@ -2899,12 +3624,7 @@ void CL_Parse_DumpPacket(void) 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(); } @@ -2916,8 +3636,31 @@ void CL_Parse_Init(void) 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); + Cvar_RegisterVariable(&cl_iplog_name); + 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"); + Cmd_AddCommand("iplog_list", CL_IPLog_List_f, "lists names of players whose IP address begins with the supplied text (example: iplog_list 123.456.789)"); } void CL_Parse_Shutdown(void)