X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=b1cf5c21809f8df7b0745c27da024a166ff5067b;hp=de5628766b8391f863d2ea92d5c53646f8baa70b;hb=06acd3f5d014dcb2d5d984d2ebe916eb5e3aa78b;hpb=73e25915f7fd668a887221bf7658d19c1d48c5ee diff --git a/cl_parse.c b/cl_parse.c index de562876..b1cf5c21 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "cdaudio.h" #include "cl_collision.h" +#include "csprogs.h" char *svc_strings[128] = { @@ -29,7 +30,7 @@ char *svc_strings[128] = "svc_nop", "svc_disconnect", "svc_updatestat", - "svc_version", // [long] server version + "svc_version", // [int] server version "svc_setview", // [short] entity number "svc_sound", // "svc_time", // [float] server time @@ -38,7 +39,7 @@ char *svc_strings[128] = // the string should be \n terminated "svc_setangle", // [vec3] set the view angle to this absolute value - "svc_serverinfo", // [long] version + "svc_serverinfo", // [int] version // [string] signon string // [string]..[0]model cache [string]...[0]sounds cache // [string]..[0]item cache @@ -82,7 +83,7 @@ char *svc_strings[128] = "", // 47 "", // 48 "", // 49 - "svc_cgame", // 50 // [short] length [bytes] data + "svc_unusedlh1", // 50 // "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 @@ -90,14 +91,86 @@ char *svc_strings[128] = "svc_spawnbaseline2", // 55 // short modelindex instead of byte "svc_spawnstatic2", // 56 // short modelindex instead of byte "svc_entities", // 57 // [int] deltaframe [int] thisframe [float vector] eye [variable length] entitydata - "svc_unusedlh3", // 58 + "svc_csqcentities", // 58 // [short] entnum [variable length] entitydata ... [short] 0x0000 "svc_spawnstaticsound2", // 59 // [coord3] [short] samp [byte] vol [byte] aten }; +char *qw_svc_strings[128] = +{ + "qw_svc_bad", // 0 + "qw_svc_nop", // 1 + "qw_svc_disconnect", // 2 + "qw_svc_updatestat", // 3 // [byte] [byte] + "", // 4 + "qw_svc_setview", // 5 // [short] entity number + "qw_svc_sound", // 6 // + "", // 7 + "qw_svc_print", // 8 // [byte] id [string] null terminated string + "qw_svc_stufftext", // 9 // [string] stuffed into client's console buffer + "qw_svc_setangle", // 10 // [angle3] set the view angle to this absolute value + "qw_svc_serverdata", // 11 // [long] protocol ... + "qw_svc_lightstyle", // 12 // [byte] [string] + "", // 13 + "qw_svc_updatefrags", // 14 // [byte] [short] + "", // 15 + "qw_svc_stopsound", // 16 // + "", // 17 + "", // 18 + "qw_svc_damage", // 19 + "qw_svc_spawnstatic", // 20 + "", // 21 + "qw_svc_spawnbaseline", // 22 + "qw_svc_temp_entity", // 23 // variable + "qw_svc_setpause", // 24 // [byte] on / off + "", // 25 + "qw_svc_centerprint", // 26 // [string] to put in center of the screen + "qw_svc_killedmonster", // 27 + "qw_svc_foundsecret", // 28 + "qw_svc_spawnstaticsound", // 29 // [coord3] [byte] samp [byte] vol [byte] aten + "qw_svc_intermission", // 30 // [vec3_t] origin [vec3_t] angle + "qw_svc_finale", // 31 // [string] text + "qw_svc_cdtrack", // 32 // [byte] track + "qw_svc_sellscreen", // 33 + "qw_svc_smallkick", // 34 // set client punchangle to 2 + "qw_svc_bigkick", // 35 // set client punchangle to 4 + "qw_svc_updateping", // 36 // [byte] [short] + "qw_svc_updateentertime", // 37 // [byte] [float] + "qw_svc_updatestatlong", // 38 // [byte] [long] + "qw_svc_muzzleflash", // 39 // [short] entity + "qw_svc_updateuserinfo", // 40 // [byte] slot [long] uid + "qw_svc_download", // 41 // [short] size [size bytes] + "qw_svc_playerinfo", // 42 // variable + "qw_svc_nails", // 43 // [byte] num [48 bits] xyzpy 12 12 12 4 8 + "qw_svc_chokecount", // 44 // [byte] packets choked + "qw_svc_modellist", // 45 // [strings] + "qw_svc_soundlist", // 46 // [strings] + "qw_svc_packetentities", // 47 // [...] + "qw_svc_deltapacketentities", // 48 // [...] + "qw_svc_maxspeed", // 49 // maxspeed change, for prediction + "qw_svc_entgravity", // 50 // gravity change, for prediction + "qw_svc_setinfo", // 51 // setinfo on a client + "qw_svc_serverinfo", // 52 // serverinfo + "qw_svc_updatepl", // 53 // [byte] [byte] +}; + //============================================================================= -cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; -cvar_t developer_networkentities = {0, "developer_networkentities", "0"}; +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)"}; + +static qboolean QW_CL_CheckOrDownloadFile(const char *filename); +static void QW_CL_RequestNextDownload(void); +static void QW_CL_NextUpload(void); +void QW_CL_StartUpload(unsigned char *data, int size); +//static qboolean QW_CL_IsUploading(void); +static void QW_CL_StopUpload(void); /* ================== @@ -113,36 +186,58 @@ void CL_ParseStartSoundPacket(int largesoundindex) int field_mask; float attenuation; - field_mask = MSG_ReadByte(); + if (cls.protocol == PROTOCOL_QUAKEWORLD) + { + channel = MSG_ReadShort(); - if (field_mask & SND_VOLUME) - volume = MSG_ReadByte (); - else - volume = DEFAULT_SOUND_PACKET_VOLUME; + if (channel & (1<<15)) + volume = MSG_ReadByte (); + else + volume = DEFAULT_SOUND_PACKET_VOLUME; - if (field_mask & SND_ATTENUATION) - attenuation = MSG_ReadByte () / 64.0; - else - attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; + if (channel & (1<<14)) + attenuation = MSG_ReadByte () / 64.0; + else + attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; - if (field_mask & SND_LARGEENTITY) - { - ent = (unsigned short) MSG_ReadShort (); - channel = MSG_ReadByte (); + ent = (channel>>3)&1023; + channel &= 7; + + sound_num = MSG_ReadByte (); } else { - channel = (unsigned short) MSG_ReadShort (); - ent = channel >> 3; - channel &= 7; - } + field_mask = MSG_ReadByte(); - if (largesoundindex || field_mask & SND_LARGESOUND) - sound_num = (unsigned short) MSG_ReadShort (); - else - sound_num = MSG_ReadByte (); + if (field_mask & SND_VOLUME) + volume = MSG_ReadByte (); + else + volume = DEFAULT_SOUND_PACKET_VOLUME; + + if (field_mask & SND_ATTENUATION) + attenuation = MSG_ReadByte () / 64.0; + else + attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; + + if (field_mask & SND_LARGEENTITY) + { + ent = (unsigned short) MSG_ReadShort (); + channel = MSG_ReadByte (); + } + else + { + channel = (unsigned short) MSG_ReadShort (); + ent = channel >> 3; + channel &= 7; + } + + if (largesoundindex || field_mask & SND_LARGESOUND) + sound_num = (unsigned short) MSG_ReadShort (); + else + sound_num = MSG_ReadByte (); + } - MSG_ReadVector(pos, cl.protocol); + MSG_ReadVector(pos, cls.protocol); if (sound_num >= MAX_SOUNDS) { @@ -168,17 +263,17 @@ so the server doesn't disconnect. ================== */ -static qbyte olddata[NET_MAXMESSAGE]; +static unsigned char olddata[NET_MAXMESSAGE]; void CL_KeepaliveMessage (void) { float time; - static float lastmsg; + static double nextmsg = -1; int oldreadcount; qboolean oldbadread; sizebuf_t old; // no need if server is local and definitely not if this is a demo - if (sv.active || cls.demoplayback) + if (sv.active || !cls.netcon || cls.protocol == PROTOCOL_QUAKEWORLD) return; // read messages from server, should just be nops @@ -194,39 +289,39 @@ void CL_KeepaliveMessage (void) net_message = old; memcpy(net_message.data, olddata, net_message.cursize); - if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5) + if (cls.netcon && (time = Sys_DoubleTime()) >= nextmsg) { sizebuf_t msg; - qbyte buf[4]; - lastmsg = time; + unsigned char buf[4]; + nextmsg = time + 5; // write out a nop // LordHavoc: must use unreliable because reliable could kill the sigon message! Con_Print("--> client to server keepalive\n"); + memset(&msg, 0, sizeof(msg)); msg.data = buf; msg.maxsize = sizeof(buf); - msg.cursize = 0; MSG_WriteChar(&msg, svc_nop); - NetConn_SendUnreliableMessage(cls.netcon, &msg); + NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol); } } void CL_ParseEntityLump(char *entdata) { const char *data; - char key[128], value[4096]; + char key[128], value[MAX_INPUTLINE]; FOG_clear(); // LordHavoc: no fog until set // LordHavoc: default to the map's sky (q3 shader parsing sets this) R_SetSkyBox(cl.worldmodel->brush.skybox); 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 @@ -236,7 +331,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)) @@ -246,309 +341,889 @@ 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); } } -/* -===================== -CL_SignonReply +static qboolean QW_CL_CheckOrDownloadFile(const char *filename) +{ + qfile_t *file; -An svc_signonnum has been received, perform a client side setup -===================== -*/ -static void CL_SignonReply (void) + // see if the file already exists + file = FS_Open(filename, "rb", true, false); + if (file) + { + FS_Close(file); + return true; + } + + // download messages in a demo would be bad + if (cls.demorecording) + { + Con_Printf("Unable to download \"%s\" when recording.\n", filename); + return true; + } + + // don't try to download when playing a demo + if (!cls.netcon) + return true; + + strlcpy(cls.qw_downloadname, filename, sizeof(cls.qw_downloadname)); + Con_Printf("Downloading %s\n", filename); + + if (!cls.qw_downloadmemory) + { + cls.qw_downloadmemory = NULL; + cls.qw_downloadmemorycursize = 0; + cls.qw_downloadmemorymaxsize = 1024*1024; // start out with a 1MB buffer + } + + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("download %s", filename)); + + cls.qw_downloadnumber++; + cls.qw_downloadpercent = 0; + cls.qw_downloadmemorycursize = 0; + + return false; +} + +static void QW_CL_ProcessUserInfo(int slot); +static void QW_CL_RequestNextDownload(void) { - //char str[8192]; + int i; -Con_DPrintf("CL_SignonReply: %i\n", cls.signon); + // clear name of file that just finished + cls.qw_downloadname[0] = 0; - switch (cls.signon) + switch (cls.qw_downloadtype) { - case 1: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "prespawn"); + case dl_single: break; + case dl_skin: + 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; + } - case 2: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string)); + cls.qw_downloadtype = dl_none; - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("color %i %i\n", cl_color.integer >> 4, cl_color.integer & 15)); + // load any newly downloaded skins + for (i = 0;i < cl.maxclients;i++) + QW_CL_ProcessUserInfo(i); - if (cl_pmodel.integer) + // if we're still in signon stages, request the next one + if (cls.signon != SIGNONS) { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer)); + 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)); } - if (*cl_playermodel.string) + break; + case dl_model: + if (cls.qw_downloadnumber == 0) { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("playermodel %s\n", cl_playermodel.string)); + Con_Printf("Checking models...\n"); + cls.qw_downloadnumber = 1; } - if (*cl_playerskin.string) + + for (;cls.qw_downloadnumber < MAX_MODELS && cl.model_name[cls.qw_downloadnumber][0];cls.qw_downloadnumber++) { - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("playerskin %s\n", cl_playerskin.string)); + // skip submodels + if (cl.model_name[cls.qw_downloadnumber][0] == '*') + continue; + if (!strcmp(cl.model_name[cls.qw_downloadnumber], "progs/spike.mdl")) + cl.qw_modelindex_spike = cls.qw_downloadnumber; + if (!strcmp(cl.model_name[cls.qw_downloadnumber], "progs/player.mdl")) + cl.qw_modelindex_player = cls.qw_downloadnumber; + if (!strcmp(cl.model_name[cls.qw_downloadnumber], "progs/flag.mdl")) + cl.qw_modelindex_flag = cls.qw_downloadnumber; + if (!strcmp(cl.model_name[cls.qw_downloadnumber], "progs/s_explod.spr")) + cl.qw_modelindex_s_explod = cls.qw_downloadnumber; + // check if we need to download the file, and return if so + if (!QW_CL_CheckOrDownloadFile(cl.model_name[cls.qw_downloadnumber])) + return; } - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); + cls.qw_downloadtype = dl_none; - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "spawn"); - break; + // touch all of the precached models that are still loaded so we can free + // anything that isn't needed + Mod_ClearUsed(); + for (i = 1;i < MAX_MODELS && cl.model_name[i][0];i++) + Mod_FindName(cl.model_name[i]); + // precache any models used by the client (this also marks them used) + cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false); + cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false); + Mod_PurgeUnused(); - case 3: - MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, "begin"); + // now we try to load everything that is new + + // world model + cl.model_precache[1] = Mod_ForName(cl.model_name[1], false, false, true); + if (cl.model_precache[1]->Draw == NULL) + Con_Printf("Map %s could not be found or downloaded\n", cl.model_name[1]); + + // normal models + for (i = 2;i < MAX_MODELS && cl.model_name[i][0];i++) + 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); + + R_Modules_NewMap(); + + // 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); + 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; + } break; + case dl_sound: + if (cls.qw_downloadnumber == 0) + { + Con_Printf("Checking sounds...\n"); + cls.qw_downloadnumber = 1; + } - case 4: - Con_ClearNotify(); + for (;cl.sound_name[cls.qw_downloadnumber][0];cls.qw_downloadnumber++) + { + // 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(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++) + { + // Don't lock the sfx here, S_ServerSounds already did that + 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)); break; + case dl_none: + default: + Con_Printf("Unknown download type.\n"); } } -/* -================== -CL_ParseServerInfo -================== -*/ -// FIXME: this is a lot of memory to be keeping around, this needs to be dynamically allocated and freed -static char parse_model_precache[MAX_MODELS][MAX_QPATH]; -static char parse_sound_precache[MAX_SOUNDS][MAX_QPATH]; -void CL_ParseServerInfo (void) +static void QW_CL_ParseDownload(void) { - char *str; - int i; - protocolversion_t protocol; - int nummodels, numsounds; - entity_t *ent; - - Con_DPrint("Serverinfo packet received.\n"); - - // check memory integrity - Mem_CheckSentinelsGlobal(); + int size = (signed short)MSG_ReadShort(); + int percent = MSG_ReadByte(); -// -// wipe the client_state_t struct -// - CL_ClearState (); + //Con_Printf("download %i %i%% (%i/%i)\n", size, percent, cls.qw_downloadmemorycursize, cls.qw_downloadmemorymaxsize); -// parse protocol version number - i = MSG_ReadLong (); - protocol = Protocol_EnumForNumber(i); - if (protocol == PROTOCOL_UNKNOWN) + // skip the download fragment if playing a demo + if (!cls.netcon) { - Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)\n", i); + if (size > 0) + msg_readcount += size; return; } - // hack for unmarked Nehahra movie demos which had a custom protocol - if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) - protocol = PROTOCOL_NEHAHRAMOVIE; - cl.protocol = protocol; - Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cl.protocol)); -// parse maxclients - cl.maxclients = MSG_ReadByte (); - if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD) + if (size == -1) { - Host_Error("Bad maxclients (%u) from server\n", cl.maxclients); + Con_Printf("File not found.\n"); + QW_CL_RequestNextDownload(); return; } - cl.scores = Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores)); -// parse gametype - cl.gametype = MSG_ReadByte (); + if (msg_readcount + (unsigned short)size > net_message.cursize) + Host_Error("corrupt download message\n"); -// parse signon message - str = MSG_ReadString (); - strlcpy (cl.levelname, str, sizeof(cl.levelname)); + // make sure the buffer is big enough to include this new fragment + if (!cls.qw_downloadmemory || cls.qw_downloadmemorymaxsize < cls.qw_downloadmemorycursize + size) + { + unsigned char *old; + while (cls.qw_downloadmemorymaxsize < cls.qw_downloadmemorycursize + size) + cls.qw_downloadmemorymaxsize *= 2; + old = cls.qw_downloadmemory; + cls.qw_downloadmemory = (unsigned char *)Mem_Alloc(cls.permanentmempool, cls.qw_downloadmemorymaxsize); + if (old) + { + memcpy(cls.qw_downloadmemory, old, cls.qw_downloadmemorycursize); + Mem_Free(old); + } + } -// seperate the printfs so the server message can have a color - if (cl.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie - Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str); + // read the fragment out of the packet + MSG_ReadBytes(size, cls.qw_downloadmemory + cls.qw_downloadmemorycursize); + cls.qw_downloadmemorycursize += size; - // check memory integrity - Mem_CheckSentinelsGlobal(); + cls.qw_downloadpercent = percent; - S_StopAllSounds(); - // if server is active, we already began a loading plaque - if (!sv.active) - SCR_BeginLoadingPlaque(); + if (percent != 100) + { + // request next fragment + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, "nextdl"); + } + else + { + // finished file + Con_Printf("Downloaded \"%s\"\n", cls.qw_downloadname); + + FS_WriteFile(cls.qw_downloadname, cls.qw_downloadmemory, cls.qw_downloadmemorycursize); + + cls.qw_downloadpercent = 0; - // disable until we get textures for it - R_ResetSkyBox(); + // start downloading the next file (or join the game) + QW_CL_RequestNextDownload(); + } +} - memset(cl.model_precache, 0, sizeof(cl.model_precache)); - memset(cl.sound_precache, 0, sizeof(cl.sound_precache)); +static void QW_CL_ParseModelList(void) +{ + int n; + int nummodels = MSG_ReadByte(); + char *str; // parse model precache list - for (nummodels=1 ; ; nummodels++) + for (;;) { str = MSG_ReadString(); if (!str[0]) break; + nummodels++; if (nummodels==MAX_MODELS) - Host_Error ("Server sent too many model precaches\n"); + 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); - strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels])); + Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); + strlcpy(cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels])); + } + + n = MSG_ReadByte(); + if (n) + { + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("modellist %i %i", cl.qw_servercount, n)); + return; } + + cls.signon = 2; + cls.qw_downloadnumber = 0; + cls.qw_downloadtype = dl_model; + QW_CL_RequestNextDownload(); +} + +static void QW_CL_ParseSoundList(void) +{ + int n; + int numsounds = MSG_ReadByte(); + char *str; + // parse sound precache list - for (numsounds=1 ; ; numsounds++) + for (;;) { str = MSG_ReadString(); if (!str[0]) break; + numsounds++; if (numsounds==MAX_SOUNDS) - Host_Error("Server sent too many sound precaches\n"); + 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); - strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds])); + strlcpy(cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds])); } - // touch all of the precached models that are still loaded so we can free - // anything that isn't needed - Mod_ClearUsed(); - for (i = 1;i < nummodels;i++) - Mod_FindName(parse_model_precache[i]); - // precache any models used by the client (this also marks them used) - cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); - cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); - cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false); - cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false); - Mod_PurgeUnused(); - - // do the same for sounds - // FIXME: S_ServerSounds does not know about cl.sfx_ sounds - S_ServerSounds (parse_sound_precache, 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); - - // now we try to load everything that is new - - // world model - CL_KeepaliveMessage (); - cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true); - if (cl.model_precache[1] == NULL) - Con_Printf("Map %s not found\n", parse_model_precache[1]); - - // normal models - for (i=2 ; imessage, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, n)); + return; } - // 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.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); +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"); +} - cl_num_entities = 1; +void QW_CL_NextUpload(void) +{ + int r, percent, size; - R_Modules_NewMap(); - CL_CGVM_Start(); + if (!cls.qw_uploaddata) + return; - // noclip is turned off at start - noclip_anglehack = false; + r = cls.qw_uploadsize - cls.qw_uploadpos; + if (r > 768) + r = 768; + size = min(1, cls.qw_uploadsize); + percent = (cls.qw_uploadpos+r)*100/size; - // check memory integrity - Mem_CheckSentinelsGlobal(); + MSG_WriteByte(&cls.netcon->message, qw_clc_upload); + MSG_WriteShort(&cls.netcon->message, r); + MSG_WriteByte(&cls.netcon->message, percent); + SZ_Write(&cls.netcon->message, cls.qw_uploaddata + cls.qw_uploadpos, r); + + Con_DPrintf("UPLOAD: %6d: %d written\n", cls.qw_uploadpos, r); + + cls.qw_uploadpos += r; + + if (cls.qw_uploadpos < cls.qw_uploadsize) + return; + + Con_Printf("Upload completed\n"); + + QW_CL_StopUpload(); } -void CL_ValidateState(entity_state_t *s) +void QW_CL_StartUpload(unsigned char *data, int size) { - model_t *model; - - if (!s->active) + // do nothing in demos or if not connected + if (!cls.netcon) return; - if (s->modelindex >= MAX_MODELS) - Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); + // abort existing upload if in progress + QW_CL_StopUpload(); - // colormap is client index + 1 - if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients) + Con_DPrintf("Starting upload of %d bytes...\n", 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; + + QW_CL_NextUpload(); +} + +#if 0 +qboolean QW_CL_IsUploading(void) +{ + return cls.qw_uploaddata != NULL; +} +#endif + +void QW_CL_StopUpload(void) +{ + if (cls.qw_uploaddata) + Mem_Free(cls.qw_uploaddata); + cls.qw_uploaddata = NULL; + cls.qw_uploadsize = 0; + cls.qw_uploadpos = 0; +} + +static void QW_CL_ProcessUserInfo(int slot) +{ + int topcolor, bottomcolor; + char temp[2048]; + InfoString_GetValue(cl.scores[slot].qw_userinfo, "name", cl.scores[slot].name, sizeof(cl.scores[slot].name)); + InfoString_GetValue(cl.scores[slot].qw_userinfo, "topcolor", temp, sizeof(temp));topcolor = atoi(temp); + InfoString_GetValue(cl.scores[slot].qw_userinfo, "bottomcolor", temp, sizeof(temp));bottomcolor = atoi(temp); + 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)); + 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) +{ + int slot; + slot = MSG_ReadByte(); + if (slot >= cl.maxclients) { - Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients); - s->colormap = 0; + Con_Printf("svc_updateuserinfo >= cl.maxclients\n"); + MSG_ReadLong(); + MSG_ReadString(); + return; } + cl.scores[slot].qw_userid = MSG_ReadLong(); + strlcpy(cl.scores[slot].qw_userinfo, MSG_ReadString(), sizeof(cl.scores[slot].qw_userinfo)); - model = cl.model_precache[s->modelindex]; - Mod_CheckLoaded(model); - if (model && model->type && s->frame >= model->numframes) + QW_CL_ProcessUserInfo(slot); +} + +static void QW_CL_SetInfo(void) +{ + int slot; + char key[2048]; + char value[2048]; + slot = MSG_ReadByte(); + strlcpy(key, MSG_ReadString(), sizeof(key)); + strlcpy(value, MSG_ReadString(), sizeof(value)); + if (slot >= cl.maxclients) { - Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes); - s->frame = 0; + Con_Printf("svc_setinfo >= cl.maxclients\n"); + return; } - if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC)) + InfoString_SetValue(cl.scores[slot].qw_userinfo, sizeof(cl.scores[slot].qw_userinfo), key, value); + + QW_CL_ProcessUserInfo(slot); +} + +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) +{ + int i, j; + int numnails = MSG_ReadByte(); + vec_t *v; + unsigned char bits[6]; + for (i = 0;i < numnails;i++) { - Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins); - s->skin = 0; + 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[4] = 360*bits[5]/256; + v[5] = 0; } } -void CL_MoveLerpEntityStates(entity_t *ent) +static void CL_UpdateItemsAndWeapon(void) { - float odelta[3], adelta[3]; - CL_ValidateState(&ent->state_current); - VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta); - VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta); - if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex) + int j; + // 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<persistent.lerpdeltatime = 0; - ent->persistent.lerpstarttime = cl.mtime[1]; - VectorCopy(ent->state_current.origin, ent->persistent.oldorigin); - VectorCopy(ent->state_current.angles, ent->persistent.oldangles); - VectorCopy(ent->state_current.origin, ent->persistent.neworigin); - VectorCopy(ent->state_current.angles, ent->persistent.newangles); - // reset animation interpolation as well - ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; - ent->render.frame1time = ent->render.frame2time = cl.time; - ent->render.framelerp = 1; + case 1: + if (cls.netcon) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, "prespawn"); + } + 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)); + + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, "spawn"); + } + break; + + case 3: + if (cls.netcon) + { + MSG_WriteByte (&cls.netcon->message, clc_stringcmd); + MSG_WriteString (&cls.netcon->message, "begin"); + } + break; + + case 4: + Con_ClearNotify(); + break; + } +} + +/* +================== +CL_ParseServerInfo +================== +*/ +void CL_ParseServerInfo (void) +{ + char *str; + int i; + protocolversion_t protocol; + int nummodels, numsounds; + + 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(); + +// +// wipe the client_state_t struct +// + CL_ClearState (); + +// parse protocol version number + i = MSG_ReadLong (); + protocol = Protocol_EnumForNumber(i); + if (protocol == PROTOCOL_UNKNOWN) + { + Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)", i); + return; + } + // hack for unmarked Nehahra movie demos which had a custom protocol + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cls.protocol = protocol; + Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cls.protocol)); + + cl.num_entities = 1; + + if (protocol == PROTOCOL_QUAKEWORLD) + { + 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; + } + + Com_Gamedir(str); // change gamedir + + if (cflag) + { + // exec the new config stuff + } +#endif + + cl.gametype = GAME_DEATHMATCH; + cl.maxclients = 32; + + // parse player number + i = MSG_ReadByte(); + // 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(cls.levelmempool, cl.maxclients*sizeof(*cl.scores)); + + // get the full level name + str = MSG_ReadString (); + strlcpy (cl.levelname, str, sizeof(cl.levelname)); + + // get the movevars + cl.qw_movevars_gravity = MSG_ReadFloat(); + cl.qw_movevars_stopspeed = MSG_ReadFloat(); + cl.qw_movevars_maxspeed = MSG_ReadFloat(); + cl.qw_movevars_spectatormaxspeed = MSG_ReadFloat(); + cl.qw_movevars_accelerate = MSG_ReadFloat(); + cl.qw_movevars_airaccelerate = MSG_ReadFloat(); + cl.qw_movevars_wateraccelerate = MSG_ReadFloat(); + cl.qw_movevars_friction = MSG_ReadFloat(); + cl.qw_movevars_waterfriction = MSG_ReadFloat(); + cl.qw_movevars_entgravity = MSG_ReadFloat(); + + // seperate the printfs so the server message can have a color + Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str); + + // check memory integrity + Mem_CheckSentinelsGlobal(); + + if (cls.netcon) + { + MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd); + MSG_WriteString(&cls.netcon->message, va("soundlist %i %i", cl.qw_servercount, 0)); + } + + 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 + { + // parse maxclients + cl.maxclients = MSG_ReadByte (); + if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD) + { + Host_Error("Bad maxclients (%u) from server", cl.maxclients); + return; + } + cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores)); + + // parse gametype + cl.gametype = MSG_ReadByte (); + + // parse signon message + str = MSG_ReadString (); + strlcpy (cl.levelname, str, sizeof(cl.levelname)); + + // seperate the printfs so the server message can have a color + if (cls.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie + Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n\2%s\n", str); + + // check memory integrity + Mem_CheckSentinelsGlobal(); + + // parse model precache list + for (nummodels=1 ; ; nummodels++) + { + str = MSG_ReadString(); + if (!str[0]) + break; + 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); + strlcpy (cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels])); + } + // parse sound precache list + for (numsounds=1 ; ; numsounds++) + { + str = MSG_ReadString(); + if (!str[0]) + break; + 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); + strlcpy (cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds])); + } + + // touch all of the precached models that are still loaded so we can free + // anything that isn't needed + Mod_ClearUsed(); + for (i = 1;i < nummodels;i++) + Mod_FindName(cl.model_name[i]); + // precache any models used by the client (this also marks them used) + cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false); + cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false); + Mod_PurgeUnused(); + + // do the same for sounds + // FIXME: S_ServerSounds does not know about cl.sfx_ sounds + S_ServerSounds (cl.sound_name, numsounds); + + // precache any sounds used by the client + 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 ; iDraw == NULL) + Con_Printf("Model %s not found\n", cl.model_name[i]); + } + + // sounds + for (i=1 ; iactive) + return; + + if (s->modelindex >= MAX_MODELS && (65536-s->modelindex) >= MAX_MODELS) + Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); + + // colormap is client index + 1 + if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients) + { + Con_DPrintf("CL_ValidateState: colormap (%i) > cl.maxclients (%i)\n", s->colormap, cl.maxclients); + s->colormap = 0; + } + + model = cl.model_precache[s->modelindex]; + if (model && model->type && s->frame >= model->numframes) + { + Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes); + s->frame = 0; + } + if (model && model->type && s->skin > 0 && s->skin >= model->numskins && !(s->lightpflags & PFLAGS_FULLDYNAMIC)) + { + Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins); + s->skin = 0; + } +} + +void CL_MoveLerpEntityStates(entity_t *ent) +{ + float odelta[3], adelta[3]; + CL_ValidateState(&ent->state_current); + VectorSubtract(ent->state_current.origin, ent->persistent.neworigin, odelta); + VectorSubtract(ent->state_current.angles, ent->persistent.newangles, adelta); + if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex) + { + // reset all persistent stuff if this is a new entity + ent->persistent.lerpdeltatime = 0; + ent->persistent.lerpstarttime = cl.mtime[1]; + VectorCopy(ent->state_current.origin, ent->persistent.oldorigin); + VectorCopy(ent->state_current.angles, ent->persistent.oldangles); + VectorCopy(ent->state_current.origin, ent->persistent.neworigin); + VectorCopy(ent->state_current.angles, ent->persistent.newangles); + // reset animation interpolation as well + ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; + ent->render.frame1time = ent->render.frame2time = cl.time; + ent->render.framelerp = 1; // reset various persistent stuff 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); @@ -574,7 +1249,7 @@ void CL_MoveLerpEntityStates(entity_t *ent) // not a monster ent->persistent.lerpstarttime = ent->state_previous.time; // no lerp if it's singleplayer - if (cl.islocalgame) + if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) ent->persistent.lerpdeltatime = 0; else ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1); @@ -611,8 +1286,8 @@ void CL_ParseBaseline (entity_t *ent, int large) ent->state_baseline.skin = MSG_ReadByte(); for (i = 0;i < 3;i++) { - ent->state_baseline.origin[i] = MSG_ReadCoord(cl.protocol); - ent->state_baseline.angles[i] = MSG_ReadAngle(cl.protocol); + 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; @@ -628,14 +1303,14 @@ 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]); VectorCopy (cl.mvelocity[0], cl.mvelocity[1]); cl.mviewzoom[1] = cl.mviewzoom[0]; - if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5) + if (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEDP || cls.protocol == PROTOCOL_NEHAHRAMOVIE || cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3 || cls.protocol == PROTOCOL_DARKPLACES4 || cls.protocol == PROTOCOL_DARKPLACES5) { cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT; cl.stats[STAT_ITEMS] = 0; @@ -669,21 +1344,21 @@ void CL_ParseClientdata (void) { if (bits & (SU_PUNCH1<= 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 @@ -777,18 +1441,16 @@ 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); + CL_UpdateRenderEntity(&ent->render); // This is definitely cheating... if (ent->render.model == NULL) - cl_num_static_entities--; + cl.num_static_entities--; } /* @@ -801,7 +1463,7 @@ void CL_ParseStaticSound (int large) vec3_t org; int sound_num, vol, atten; - MSG_ReadVector(org, cl.protocol); + MSG_ReadVector(org, cls.protocol); if (large) sound_num = (unsigned short) MSG_ReadShort (); else @@ -817,7 +1479,7 @@ void CL_ParseEffect (void) vec3_t org; int modelindex, startframe, framecount, framerate; - MSG_ReadVector(org, cl.protocol); + MSG_ReadVector(org, cls.protocol); modelindex = MSG_ReadByte (); startframe = MSG_ReadByte (); framecount = MSG_ReadByte (); @@ -831,7 +1493,7 @@ void CL_ParseEffect2 (void) vec3_t org; int modelindex, startframe, framecount, framerate; - MSG_ReadVector(org, cl.protocol); + MSG_ReadVector(org, cls.protocol); modelindex = (unsigned short) MSG_ReadShort (); startframe = (unsigned short) MSG_ReadShort (); framecount = MSG_ReadByte (); @@ -840,471 +1502,684 @@ 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; - beam_t *b; - - ent = (unsigned short) MSG_ReadShort (); - MSG_ReadVector(start, cl.protocol); - MSG_ReadVector(end, cl.protocol); + int i; + beam_t *b = NULL; 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 - for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + i = cl.max_beams; + if (ent) + 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) + break; + if (i < cl.max_beams) { - if (b->entity == ent && ent) - { - //b->entity = ent; - b->lightning = lightning; - b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; - b->model = m; - b->endtime = cl.time + 0.2; - VectorCopy (start, b->start); - VectorCopy (end, b->end); - return; - } + cl.num_beams = max(cl.num_beams, i + 1); + b->entity = ent; + b->lightning = lightning; + b->model = m; + b->endtime = cl.mtime[0] + 0.2; + VectorCopy (start, b->start); + VectorCopy (end, b->end); } + 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); - // find a free beam - for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + if (ent >= MAX_EDICTS) { - if (!b->model || b->endtime < cl.time) - { - b->entity = ent; - b->lightning = lightning; - b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; - b->model = m; - b->endtime = cl.time + 0.2; - VectorCopy (start, b->start); - VectorCopy (end, b->end); - return; - } + Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent); + ent = 0; } - Con_Print("beam list overflow!\n"); + + 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; float velspeed, radius; - qbyte *tempcolor; + unsigned char *tempcolor; matrix4x4_t tempmatrix; - type = MSG_ReadByte(); - switch (type) + if (cls.protocol == PROTOCOL_QUAKEWORLD) { - case TE_WIZSPIKE: - // spike hitting wall - MSG_ReadVector(pos, cl.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); - S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1); - break; + type = MSG_ReadByte(); + switch (type) + { + case QW_TE_WIZSPIKE: + // spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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; - case TE_KNIGHTSPIKE: - // spike hitting wall - MSG_ReadVector(pos, cl.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); - S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1); - break; + case QW_TE_KNIGHTSPIKE: + // spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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; - case TE_SPIKE: - // spike hitting wall - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - if (cl_particles_bulletimpacts.integer) - { - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); - CL_BulletMark(pos); - } - if (rand() % 5) - S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); - else - { - rnd = rand() & 3; - if (rnd == 1) - S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); - else if (rnd == 2) - S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); - else - S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); - } - break; - case TE_SPIKEQUAD: - // quad spike hitting wall - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to spark shower - if (cl_particles_bulletimpacts.integer) - { - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); - 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); - if (rand() % 5) - S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); - else - { - rnd = rand() & 3; - if (rnd == 1) - S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); - else if (rnd == 2) - S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + case QW_TE_SPIKE: + // spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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 - S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); - } - break; - case TE_SUPERSPIKE: - // super spike hitting wall - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to dust shower - if (cl_particles_bulletimpacts.integer) - { - CL_SparkShower(pos, vec3_origin, 30, 1); - CL_Smoke(pos, vec3_origin, 30); - CL_BulletMark(pos); - } - if (rand() % 5) - S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); - else - { - rnd = rand() & 3; - if (rnd == 1) - S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); - else if (rnd == 2) - S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); - else - S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); - } - break; - case TE_SUPERSPIKEQUAD: - // quad super spike hitting wall - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to dust shower - if (cl_particles_bulletimpacts.integer) - { - CL_SparkShower(pos, vec3_origin, 30, 1); - CL_Smoke(pos, vec3_origin, 30); - 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); - if (rand() % 5) - S_StartSound(-1, 0, cl.sfx_tink1, pos, 1, 1); - else - { - rnd = rand() & 3; - if (rnd == 1) - S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); - else if (rnd == 2) - S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); + } + break; + case QW_TE_SUPERSPIKE: + // super spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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 - S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); - } - break; - // LordHavoc: added for improved blood splatters - case TE_BLOOD: - // blood puff - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - dir[0] = MSG_ReadChar(); - dir[1] = MSG_ReadChar(); - dir[2] = MSG_ReadChar(); - count = MSG_ReadByte(); - CL_BloodPuff(pos, dir, count); - break; - case TE_SPARK: - // spark shower - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - dir[0] = MSG_ReadChar(); - dir[1] = MSG_ReadChar(); - dir[2] = MSG_ReadChar(); - count = MSG_ReadByte(); - CL_SparkShower(pos, dir, count, 1); - break; - case TE_PLASMABURN: - MSG_ReadVector(pos, cl.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); - break; - // LordHavoc: added for improved gore - case TE_BLOODSHOWER: - // vaporized body - MSG_ReadVector(pos, cl.protocol); // mins - MSG_ReadVector(pos2, cl.protocol); // maxs - velspeed = MSG_ReadCoord(cl.protocol); // speed - count = (unsigned short) MSG_ReadShort(); // number of particles - CL_BloodShower(pos, pos2, velspeed, count); - break; - case TE_PARTICLECUBE: - // general purpose particle effect - MSG_ReadVector(pos, cl.protocol); // mins - MSG_ReadVector(pos2, cl.protocol); // maxs - MSG_ReadVector(dir, cl.protocol); // dir - count = (unsigned short) MSG_ReadShort(); // number of particles - colorStart = MSG_ReadByte(); // color - colorLength = MSG_ReadByte(); // gravity (1 or 0) - velspeed = MSG_ReadCoord(cl.protocol); // randomvel - CL_ParticleCube(pos, pos2, dir, count, colorStart, colorLength, velspeed); - break; - - case TE_PARTICLERAIN: - // general purpose particle effect - MSG_ReadVector(pos, cl.protocol); // mins - MSG_ReadVector(pos2, cl.protocol); // maxs - MSG_ReadVector(dir, cl.protocol); // dir - count = (unsigned short) MSG_ReadShort(); // number of particles - colorStart = MSG_ReadByte(); // color - CL_ParticleRain(pos, pos2, dir, count, colorStart, 0); - break; - - case TE_PARTICLESNOW: - // general purpose particle effect - MSG_ReadVector(pos, cl.protocol); // mins - MSG_ReadVector(pos2, cl.protocol); // maxs - MSG_ReadVector(dir, cl.protocol); // dir - count = (unsigned short) MSG_ReadShort(); // number of particles - colorStart = MSG_ReadByte(); // color - CL_ParticleRain(pos, pos2, dir, count, colorStart, 1); - break; - - case TE_GUNSHOT: - // bullet hitting wall - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); - CL_BulletMark(pos); - break; - - case TE_GUNSHOTQUAD: - // quad bullet hitting wall - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); - 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); - break; + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); + } + break; - case TE_EXPLOSION: - // rocket explosion - MSG_ReadVector(pos, cl.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) + case QW_TE_EXPLOSION: + // rocket explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + 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; + CL_Effect(pos, cl.qw_modelindex_s_explod, 0, 6, 10); + break; - case TE_EXPLOSIONQUAD: - // quad rocket explosion - MSG_ReadVector(pos, cl.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) + case QW_TE_TAREXPLOSION: + // tarbaby explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + 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; + break; - case TE_EXPLOSION3: - // Nehahra movie colored lighting explosion - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 10); - CL_ParticleExplosion(pos); - Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - color[0] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); - color[1] = MSG_ReadCoord(cl.protocol) * (2.0f / 1.0f); - color[2] = MSG_ReadCoord(cl.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) + case QW_TE_LIGHTNING1: + // lightning bolts + CL_ParseBeam(cl.model_bolt, true); + break; + + case QW_TE_LIGHTNING2: + // lightning bolts + CL_ParseBeam(cl.model_bolt2, true); + break; + + case QW_TE_LIGHTNING3: + // lightning bolts + CL_ParseBeam(cl.model_bolt3, false); + break; + + case QW_TE_LAVASPLASH: + MSG_ReadVector(pos, cls.protocol); + CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; + + case QW_TE_TELEPORT: + MSG_ReadVector(pos, cls.protocol); + CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; + + case QW_TE_GUNSHOT: + // bullet hitting wall + radius = MSG_ReadByte(); + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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_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_ParticleEffect(EFFECT_TE_BLOOD, 2.5, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; + + default: + Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type); + } + } + else + { + type = MSG_ReadByte(); + switch (type) + { + case TE_WIZSPIKE: + // spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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; + + case TE_KNIGHTSPIKE: + // spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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; + + case TE_SPIKE: + // spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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 + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); + } + break; + case TE_SPIKEQUAD: + // quad spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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 + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); + } + break; + case TE_SUPERSPIKE: + // super spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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 + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); + } + break; + case TE_SUPERSPIKEQUAD: + // quad super spike hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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 + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound(-1, 0, cl.sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound(-1, 0, cl.sfx_ric2, pos, 1, 1); + else + S_StartSound(-1, 0, cl.sfx_ric3, pos, 1, 1); + } + break; + // LordHavoc: added for improved blood splatters + case TE_BLOOD: + // blood puff + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + dir[0] = MSG_ReadChar(); + dir[1] = MSG_ReadChar(); + dir[2] = MSG_ReadChar(); + count = MSG_ReadByte(); + CL_ParticleEffect(EFFECT_TE_BLOOD, count, pos, pos, dir, dir, NULL, 0); + break; + case TE_SPARK: + // spark shower + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + dir[0] = MSG_ReadChar(); + dir[1] = MSG_ReadChar(); + dir[2] = MSG_ReadChar(); + count = MSG_ReadByte(); + 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); + CL_ParticleEffect(EFFECT_TE_PLASMABURN, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; + // LordHavoc: added for improved gore + case TE_BLOODSHOWER: + // vaporized body + MSG_ReadVector(pos, cls.protocol); // mins + MSG_ReadVector(pos2, cls.protocol); // maxs + velspeed = MSG_ReadCoord(cls.protocol); // speed + count = (unsigned short) MSG_ReadShort(); // number of particles + 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 + MSG_ReadVector(pos2, cls.protocol); // maxs + MSG_ReadVector(dir, cls.protocol); // dir + count = (unsigned short) MSG_ReadShort(); // number of particles + 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 != 0, velspeed); + break; + + case TE_PARTICLERAIN: + // general purpose particle effect + MSG_ReadVector(pos, cls.protocol); // mins + MSG_ReadVector(pos2, cls.protocol); // maxs + MSG_ReadVector(dir, cls.protocol); // dir + count = (unsigned short) MSG_ReadShort(); // number of particles + colorStart = MSG_ReadByte(); // color + CL_ParticleRain(pos, pos2, dir, count, colorStart, 0); + break; + + case TE_PARTICLESNOW: + // general purpose particle effect + MSG_ReadVector(pos, cls.protocol); // mins + MSG_ReadVector(pos2, cls.protocol); // maxs + MSG_ReadVector(dir, cls.protocol); // dir + count = (unsigned short) MSG_ReadShort(); // number of particles + colorStart = MSG_ReadByte(); // color + CL_ParticleRain(pos, pos2, dir, count, colorStart, 1); + break; + + case TE_GUNSHOT: + // bullet hitting wall + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + 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); + 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_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; + break; - case TE_EXPLOSIONRGB: - // colored lighting explosion - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 10); - CL_ParticleExplosion(pos); - color[0] = MSG_ReadByte() * (2.0f / 255.0f); - 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) + case TE_EXPLOSIONQUAD: + // quad rocket explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + 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; + break; - case TE_TAREXPLOSION: - // tarbaby explosion - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 10); - CL_BlobExplosion(pos); + case TE_EXPLOSION3: + // Nehahra movie colored lighting explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + 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_ParticleExplosion(pos); + 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); + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); + break; - if (gamemode != GAME_NEXUIZ) + case TE_EXPLOSIONRGB: + // colored lighting explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleExplosion(pos); + color[0] = MSG_ReadByte() * (2.0f / 255.0f); + 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); 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); - break; + break; - case TE_SMALLFLASH: - MSG_ReadVector(pos, cl.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); - break; + case TE_TAREXPLOSION: + // tarbaby explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + 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_CUSTOMFLASH: - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 4); - radius = (MSG_ReadByte() + 1) * 8; - velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); - color[0] = MSG_ReadByte() * (2.0f / 255.0f); - 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); - break; + case TE_SMALLFLASH: + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_ParticleEffect(EFFECT_TE_SMALLFLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; - case TE_FLAMEJET: - MSG_ReadVector(pos, cl.protocol); - MSG_ReadVector(dir, cl.protocol); - count = MSG_ReadByte(); - CL_Flames(pos, dir, count); - break; + case TE_CUSTOMFLASH: + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 4); + radius = (MSG_ReadByte() + 1) * 8; + velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); + color[0] = MSG_ReadByte() * (2.0f / 255.0f); + 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); + break; - case TE_LIGHTNING1: - // lightning bolts - CL_ParseBeam(cl.model_bolt, true); - break; + case TE_FLAMEJET: + MSG_ReadVector(pos, cls.protocol); + MSG_ReadVector(dir, cls.protocol); + count = MSG_ReadByte(); + CL_ParticleEffect(EFFECT_TE_FLAMEJET, count, pos, pos, dir, dir, NULL, 0); + break; - case TE_LIGHTNING2: - // lightning bolts - CL_ParseBeam(cl.model_bolt2, true); - break; + case TE_LIGHTNING1: + // lightning bolts + CL_ParseBeam(cl.model_bolt, true); + break; - case TE_LIGHTNING3: - // lightning bolts - CL_ParseBeam(cl.model_bolt3, false); - break; + case TE_LIGHTNING2: + // lightning bolts + CL_ParseBeam(cl.model_bolt2, true); + break; -// PGM 01/21/97 - case TE_BEAM: - // grappling hook beam - CL_ParseBeam(cl.model_beam, false); - break; -// PGM 01/21/97 + case TE_LIGHTNING3: + // lightning bolts + CL_ParseBeam(cl.model_bolt3, false); + break; -// LordHavoc: for compatibility with the Nehahra movie... - case TE_LIGHTNING4NEH: - CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false); - break; + // PGM 01/21/97 + case TE_BEAM: + // grappling hook beam + CL_ParseBeam(cl.model_beam, false); + break; + // PGM 01/21/97 - case TE_LAVASPLASH: - MSG_ReadVector(pos, cl.protocol); - CL_LavaSplash(pos); - break; + // LordHavoc: for compatibility with the Nehahra movie... + case TE_LIGHTNING4NEH: + CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false); + break; - case TE_TELEPORT: - MSG_ReadVector(pos, cl.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); - break; + case TE_LAVASPLASH: + MSG_ReadVector(pos, cls.protocol); + CL_ParticleEffect(EFFECT_TE_LAVASPLASH, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; - case TE_EXPLOSION2: - // color mapped explosion - MSG_ReadVector(pos, cl.protocol); - CL_FindNonSolidLocation(pos, pos, 10); - colorStart = MSG_ReadByte(); - colorLength = MSG_ReadByte(); - CL_ParticleExplosion2(pos, colorStart, colorLength); - tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart]; - color[0] = tempcolor[0] * (2.0f / 255.0f); - 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) + case TE_TELEPORT: + MSG_ReadVector(pos, cls.protocol); + CL_ParticleEffect(EFFECT_TE_TELEPORT, 1, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; + + case TE_EXPLOSION2: + // color mapped explosion + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + colorStart = MSG_ReadByte(); + colorLength = MSG_ReadByte(); + CL_ParticleExplosion2(pos, colorStart, colorLength); + tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart]; + color[0] = tempcolor[0] * (2.0f / 255.0f); + 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); S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); - break; + break; - case TE_TEI_G3: - MSG_ReadVector(pos, cl.protocol); - MSG_ReadVector(pos2, cl.protocol); - MSG_ReadVector(dir, cl.protocol); - CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1); - break; + case TE_TEI_G3: + MSG_ReadVector(pos, cls.protocol); + MSG_ReadVector(pos2, cls.protocol); + MSG_ReadVector(dir, cls.protocol); + CL_ParticleEffect(EFFECT_TE_TEI_G3, 1, pos, pos2, dir, dir, NULL, 0); + break; - case TE_TEI_SMOKE: - MSG_ReadVector(pos, cl.protocol); - MSG_ReadVector(dir, cl.protocol); - count = MSG_ReadByte(); - CL_FindNonSolidLocation(pos, pos, 4); - CL_Tei_Smoke(pos, dir, count); - break; + case TE_TEI_SMOKE: + MSG_ReadVector(pos, cls.protocol); + MSG_ReadVector(dir, cls.protocol); + count = MSG_ReadByte(); + CL_FindNonSolidLocation(pos, pos, 4); + CL_ParticleEffect(EFFECT_TE_TEI_SMOKE, count, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; - case TE_TEI_BIGEXPLOSION: - MSG_ReadVector(pos, cl.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) + case TE_TEI_BIGEXPLOSION: + MSG_ReadVector(pos, cls.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + 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; + break; - case TE_TEI_PLASMAHIT: - MSG_ReadVector(pos, cl.protocol); - MSG_ReadVector(dir, cl.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); - break; + case TE_TEI_PLASMAHIT: + MSG_ReadVector(pos, cls.protocol); + MSG_ReadVector(dir, cls.protocol); + count = MSG_ReadByte(); + CL_FindNonSolidLocation(pos, pos, 5); + CL_ParticleEffect(EFFECT_TE_TEI_PLASMAHIT, count, pos, pos, vec3_origin, vec3_origin, NULL, 0); + break; - default: - Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type); + default: + Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type); + } } } +// 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++) + ; + if (cl.scores[cl.parsingtextplayerindex].name[charindex] == 0 && 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; +} + #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x); -static qbyte cgamenetbuffer[65536]; +//[515]: csqc +void CL_VM_Init (void); +qboolean CL_VM_Parse_TempEntity (void); +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); /* ===================== @@ -1317,10 +2192,9 @@ void CL_ParseServerMessage(void) int cmd; int i; protocolversion_t protocol; - qbyte cmdlog[32]; + unsigned char cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; - qboolean sendmove = false; if (cls.demorecording) CL_WriteDemoMessage (); @@ -1335,7 +2209,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 // @@ -1343,407 +2216,769 @@ void CL_ParseServerMessage(void) parsingerror = true; - while (1) + if (cls.protocol == PROTOCOL_QUAKEWORLD) { - if (msg_badread) - Host_Error ("CL_ParseServerMessage: Bad server message"); - - cmd = MSG_ReadByte (); - - if (cmd == -1) + cl.mtime[1] = cl.mtime[0]; + cl.mtime[0] = realtime; // qw has no clock + cl.movement_needupdate = true; + cl.onground = false; // since there's no clientdata parsing, clear the onground flag here + // 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]); + + // force a recalculation of the player prediction + cl.movement_replay = true; + + // 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 * (cl.time - cl.oldtime), 0); + + while (1) { - SHOWNET("END OF MESSAGE"); - break; // end of message - } + if (msg_badread) + Host_Error ("CL_ParseServerMessage: Bad QW server message"); - cmdindex = cmdcount & 31; - cmdcount++; - cmdlog[cmdindex] = cmd; + cmd = MSG_ReadByte (); - // if the high bit of the command byte is set, it is a fast update - if (cmd & 128) - { - // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) - temp = "entity"; - cmdlogname[cmdindex] = temp; - SHOWNET("fast update"); - if (cls.signon == SIGNONS - 1) + if (cmd == -1) { - // first update is the final signon stage - cls.signon = SIGNONS; - CL_SignonReply (); + SHOWNET("END OF MESSAGE"); + break; // end of message } - EntityFrameQuake_ReadEntity (cmd&127); - continue; - } - SHOWNET(svc_strings[cmd]); - cmdlogname[cmdindex] = svc_strings[cmd]; - if (!cmdlogname[cmdindex]) - { - // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) - temp = ""; - cmdlogname[cmdindex] = temp; - } + cmdindex = cmdcount & 31; + cmdcount++; + cmdlog[cmdindex] = cmd; - // other commands - switch (cmd) - { - default: + SHOWNET(qw_svc_strings[cmd]); + cmdlogname[cmdindex] = qw_svc_strings[cmd]; + if (!cmdlogname[cmdindex]) + { + // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) + temp = ""; + cmdlogname[cmdindex] = temp; + } + + // other commands + switch (cmd) { - char description[32*64], temp[64]; - int count; - strcpy (description, "packet dump: "); - i = cmdcount - 32; - if (i < 0) - i = 0; - count = cmdcount - i; - i &= 31; - while(count > 0) + default: { - dpsnprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); - strlcat (description, temp, sizeof (description)); - count--; - i++; + char description[32*64], temp[64]; + int count; + strlcpy(description, "packet dump: ", sizeof(description)); + i = cmdcount - 32; + if (i < 0) + i = 0; + count = cmdcount - i; i &= 31; + while(count > 0) + { + dpsnprintf(temp, sizeof(temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); + strlcat(description, temp, sizeof(description)); + count--; + i++; + i &= 31; + } + description[strlen(description)-1] = '\n'; // replace the last space with a newline + Con_Print(description); + Host_Error("CL_ParseServerMessage: Illegible server message"); } - description[strlen(description)-1] = '\n'; // replace the last space with a newline - Con_Print(description); - Host_Error ("CL_ParseServerMessage: Illegible server message\n"); - } - break; + break; - case svc_nop: - if (cls.signon < SIGNONS) - Con_Print("<-- server to client keepalive\n"); - break; - - case svc_time: - cl.mtime[1] = cl.mtime[0]; - cl.mtime[0] = MSG_ReadFloat (); - sendmove = true; - break; - - case svc_clientdata: - CL_ParseClientdata(); - break; - - case svc_version: - i = MSG_ReadLong (); - protocol = Protocol_EnumForNumber(i); - if (protocol == PROTOCOL_UNKNOWN) - Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)\n", i); - // hack for unmarked Nehahra movie demos which had a custom protocol - if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) - protocol = PROTOCOL_NEHAHRAMOVIE; - cl.protocol = protocol; - break; - - case svc_disconnect: - Con_Printf ("Server disconnected\n"); - if (cls.demonum != -1) - CL_NextDemo (); - else - CL_Disconnect (); - break; + case qw_svc_nop: + //Con_Printf("qw_svc_nop\n"); + break; - case svc_print: - Con_Print(MSG_ReadString()); - break; + case qw_svc_disconnect: + Con_Printf("Server disconnected\n"); + if (cls.demonum != -1) + CL_NextDemo(); + else + CL_Disconnect(); + return; - case svc_centerprint: - SCR_CenterPrint(MSG_ReadString ()); - break; + case qw_svc_print: + i = MSG_ReadByte(); + 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: + CL_VM_Parse_CenterPrint(MSG_ReadString ()); //[515]: csqc + break; + + case qw_svc_stufftext: + CL_VM_Parse_StuffCmd(MSG_ReadString ()); //[515]: csqc + break; + + case qw_svc_damage: + // svc_damage protocol is identical to nq + V_ParseDamage (); + break; + + case qw_svc_serverdata: + //Cbuf_Execute(); // make sure any stuffed commands are done + CL_ParseServerInfo(); + CL_VM_Init(); //[515]: init csqc + break; + + 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 svc_stufftext: - Cbuf_AddText (MSG_ReadString ()); - break; + case qw_svc_lightstyle: + i = MSG_ReadByte (); + 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); + break; + + case qw_svc_sound: + CL_ParseStartSoundPacket(false); + break; + + case qw_svc_stopsound: + i = (unsigned short) MSG_ReadShort(); + S_StopSound(i>>3, i&7); + break; + + case qw_svc_updatefrags: + i = MSG_ReadByte(); + if (i >= cl.maxclients) + Host_Error("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients"); + cl.scores[i].frags = (signed short) MSG_ReadShort(); + break; + + case qw_svc_updateping: + i = MSG_ReadByte(); + if (i >= cl.maxclients) + Host_Error("CL_ParseServerMessage: svc_updateping >= cl.maxclients"); + cl.scores[i].qw_ping = MSG_ReadShort(); + break; + + case qw_svc_updatepl: + i = MSG_ReadByte(); + if (i >= cl.maxclients) + Host_Error("CL_ParseServerMessage: svc_updatepl >= cl.maxclients"); + cl.scores[i].qw_packetloss = MSG_ReadByte(); + break; + + case qw_svc_updateentertime: + i = MSG_ReadByte(); + if (i >= cl.maxclients) + Host_Error("CL_ParseServerMessage: svc_updateentertime >= cl.maxclients"); + // seconds ago + 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) + CL_ExpandEntities(i); + CL_ParseBaseline(cl.entities + i, false); + break; + case qw_svc_spawnstatic: + CL_ParseStatic(false); + break; + case qw_svc_temp_entity: + if(!CL_VM_Parse_TempEntity()) + CL_ParseTempEntity (); + break; + + case qw_svc_killedmonster: + cl.stats[STAT_MONSTERS]++; + break; + + case qw_svc_foundsecret: + cl.stats[STAT_SECRETS]++; + break; + + case qw_svc_updatestat: + i = MSG_ReadByte (); + if (i < 0 || i >= MAX_CL_STATS) + Host_Error ("svc_updatestat: %i is invalid", i); + cl.stats[i] = MSG_ReadByte (); + break; + + case qw_svc_updatestatlong: + i = MSG_ReadByte (); + if (i < 0 || i >= MAX_CL_STATS) + Host_Error ("svc_updatestatlong: %i is invalid", i); + cl.stats[i] = MSG_ReadLong (); + break; + + case qw_svc_spawnstaticsound: + CL_ParseStaticSound (false); + break; + + case qw_svc_cdtrack: + cl.cdtrack = cl.looptrack = MSG_ReadByte (); + if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) + CDAudio_Play ((unsigned char)cls.forcetrack, true); + else + CDAudio_Play ((unsigned char)cl.cdtrack, true); + break; + + case qw_svc_intermission: + cl.intermission = 1; + cl.completed_time = cl.time; + MSG_ReadVector(cl.qw_intermission_origin, cls.protocol); + for (i = 0;i < 3;i++) + cl.qw_intermission_angles[i] = MSG_ReadAngle(cls.protocol); + break; + + case qw_svc_finale: + cl.intermission = 2; + cl.completed_time = cl.time; + SCR_CenterPrint(MSG_ReadString ()); + break; + + case qw_svc_sellscreen: + Cmd_ExecuteString ("help", src_command); + break; + + case qw_svc_smallkick: + cl.qw_weaponkick = -2; + break; + case qw_svc_bigkick: + cl.qw_weaponkick = -4; + break; + + case qw_svc_muzzleflash: + i = (unsigned short) MSG_ReadShort(); + // 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) + CL_ExpandEntities(i); + cl.entities[i].persistent.muzzleflash = 1.0f; + break; + + case qw_svc_updateuserinfo: + QW_CL_UpdateUserInfo(); + break; + + case qw_svc_setinfo: + QW_CL_SetInfo(); + break; + + case qw_svc_serverinfo: + QW_CL_ServerInfo(); + break; + + case qw_svc_download: + QW_CL_ParseDownload(); + break; + + case qw_svc_playerinfo: + EntityStateQW_ReadPlayerUpdate(); + break; + + case qw_svc_nails: + QW_CL_ParseNails(); + break; + + case qw_svc_chokecount: + i = MSG_ReadByte(); + // FIXME: apply to netgraph + //for (j = 0;j < i;j++) + // cl.frames[(cls.netcon->qw.incoming_acknowledged-1-j)&QW_UPDATE_MASK].receivedtime = -2; + break; + + case qw_svc_modellist: + QW_CL_ParseModelList(); + break; + + case qw_svc_soundlist: + QW_CL_ParseSoundList(); + break; + + case qw_svc_packetentities: + EntityFrameQW_CL_ReadFrame(false); + // first update is the final signon stage + if (cls.signon == SIGNONS - 1) + cls.signon = SIGNONS; + break; - case svc_damage: - V_ParseDamage (); - break; + case qw_svc_deltapacketentities: + EntityFrameQW_CL_ReadFrame(true); + // first update is the final signon stage + if (cls.signon == SIGNONS - 1) + cls.signon = SIGNONS; + break; + + case qw_svc_maxspeed: + cl.qw_movevars_maxspeed = MSG_ReadFloat(); + break; + + case qw_svc_entgravity: + cl.qw_movevars_entgravity = MSG_ReadFloat(); + break; + + case qw_svc_setpause: + cl.paused = MSG_ReadByte (); + if (cl.paused) + CDAudio_Pause (); + else + CDAudio_Resume (); + S_PauseGameSounds (cl.paused); + break; + } + } - case svc_serverinfo: - CL_ParseServerInfo (); - break; + // 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 + { + while (1) + { + if (msg_badread) + Host_Error ("CL_ParseServerMessage: Bad server message"); - case svc_setangle: - for (i=0 ; i<3 ; i++) - cl.viewangles[i] = MSG_ReadAngle (cl.protocol); - break; + cmd = MSG_ReadByte (); - case svc_setview: - cl.viewentity = (unsigned short)MSG_ReadShort (); - if (cl.viewentity >= MAX_EDICTS) - Host_Error("svc_setview >= MAX_EDICTS\n"); - if (cl.viewentity >= cl_max_entities) - CL_ExpandEntities(cl.viewentity); - // LordHavoc: assume first setview recieved is the real player entity - if (!cl.playerentity) - cl.playerentity = cl.viewentity; - break; + if (cmd == -1) + { + SHOWNET("END OF MESSAGE"); + break; // end of message + } - case svc_lightstyle: - i = MSG_ReadByte (); - if (i >= MAX_LIGHTSTYLES) - Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); - strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map)); - cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0; - cl_lightstyle[i].length = strlen(cl_lightstyle[i].map); - break; + cmdindex = cmdcount & 31; + cmdcount++; + cmdlog[cmdindex] = cmd; - case svc_sound: - CL_ParseStartSoundPacket(false); - break; + // if the high bit of the command byte is set, it is a fast update + if (cmd & 128) + { + // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) + temp = "entity"; + cmdlogname[cmdindex] = temp; + SHOWNET("fast update"); + if (cls.signon == SIGNONS - 1) + { + // first update is the final signon stage + cls.signon = SIGNONS; + CL_SignonReply (); + } + EntityFrameQuake_ReadEntity (cmd&127); + continue; + } - case svc_precache: - if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3) + SHOWNET(svc_strings[cmd]); + cmdlogname[cmdindex] = svc_strings[cmd]; + if (!cmdlogname[cmdindex]) { - // was svc_sound2 in protocols 1, 2, 3, removed in 4, 5, changed to svc_precache in 6 - CL_ParseStartSoundPacket(true); + // LordHavoc: fix for bizarre problem in MSVC that I do not understand (if I assign the string pointer directly it ends up storing a NULL pointer) + temp = ""; + cmdlogname[cmdindex] = temp; } - else + + // other commands + switch (cmd) { - int i = (unsigned short)MSG_ReadShort(); - char *s = MSG_ReadString(); - if (i < 32768) + default: { - if (i >= 1 && i < MAX_MODELS) + char description[32*64], temp[64]; + int count; + strlcpy (description, "packet dump: ", sizeof(description)); + i = cmdcount - 32; + if (i < 0) + i = 0; + count = cmdcount - i; + i &= 31; + while(count > 0) { - model_t *model = Mod_ForName(s, false, false, i == 1); - if (!model) - Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s); - cl.model_precache[i] = model; + dpsnprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); + strlcat (description, temp, sizeof (description)); + count--; + i++; + i &= 31; } - else - Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_MODELS); + description[strlen(description)-1] = '\n'; // replace the last space with a newline + Con_Print(description); + Host_Error ("CL_ParseServerMessage: Illegible server message"); } + break; + + case svc_nop: + if (cls.signon < SIGNONS) + Con_Print("<-- server to client keepalive\n"); + break; + + case svc_time: + cl.mtime[1] = cl.mtime[0]; + cl.mtime[0] = MSG_ReadFloat (); + cl.movement_needupdate = true; + // 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]); + break; + + case svc_clientdata: + CL_ParseClientdata(); + break; + + case svc_version: + i = MSG_ReadLong (); + protocol = Protocol_EnumForNumber(i); + if (protocol == PROTOCOL_UNKNOWN) + Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)", i); + // hack for unmarked Nehahra movie demos which had a custom protocol + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cls.protocol = protocol; + break; + + case svc_disconnect: + Con_Printf ("Server disconnected\n"); + if (cls.demonum != -1) + CL_NextDemo (); else + CL_Disconnect (); + break; + + case svc_print: + 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: + CL_VM_Parse_CenterPrint(MSG_ReadString ()); //[515]: csqc + break; + + case svc_stufftext: + CL_VM_Parse_StuffCmd(MSG_ReadString ()); //[515]: csqc + break; + + case svc_damage: + V_ParseDamage (); + break; + + case svc_serverinfo: + CL_ParseServerInfo (); + CL_VM_Init(); //[515]: init csqc + break; + + 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) + CL_ExpandEntities(cl.viewentity); + // LordHavoc: assume first setview recieved is the real player entity + if (!cl.playerentity) + cl.playerentity = cl.viewentity; + break; + + case svc_lightstyle: + i = MSG_ReadByte (); + if (i >= cl.max_lightstyle) { - i -= 32768; - if (i >= 1 && i < MAX_SOUNDS) + 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); + break; + + case svc_sound: + CL_ParseStartSoundPacket(false); + break; + + case svc_precache: + if (cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3) + { + // was svc_sound2 in protocols 1, 2, 3, removed in 4, 5, changed to svc_precache in 6 + CL_ParseStartSoundPacket(true); + } + else + { + int i = (unsigned short)MSG_ReadShort(); + char *s = MSG_ReadString(); + if (i < 32768) { - sfx_t *sfx = S_PrecacheSound (s, true, false); - if (!sfx && snd_initialized.integer) - Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s); - cl.sound_precache[i] = sfx; + if (i >= 1 && i < MAX_MODELS) + { + model_t *model = Mod_ForName(s, false, false, i == 1); + if (!model) + Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s); + cl.model_precache[i] = model; + } + else + Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_MODELS); } else - Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_SOUNDS); + { + i -= 32768; + if (i >= 1 && i < MAX_SOUNDS) + { + sfx_t *sfx = S_PrecacheSound (s, true, false); + if (!sfx && snd_initialized.integer) + Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s); + cl.sound_precache[i] = sfx; + } + else + Con_Printf("svc_precache: index %i outside range %i...%i\n", i, 1, MAX_SOUNDS); + } } - } - break; - - case svc_stopsound: - i = (unsigned short) MSG_ReadShort(); - S_StopSound(i>>3, i&7); - break; - - case svc_updatename: - i = MSG_ReadByte (); - if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); - strlcpy (cl.scores[i].name, MSG_ReadString (), sizeof (cl.scores[i].name)); - break; - - case svc_updatefrags: - i = MSG_ReadByte (); - if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients"); - cl.scores[i].frags = (signed short) MSG_ReadShort (); - break; - - case svc_updatecolors: - i = MSG_ReadByte (); - if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients"); - cl.scores[i].colors = MSG_ReadByte (); - break; - - case svc_particle: - CL_ParseParticleEffect (); - break; - - case svc_effect: - CL_ParseEffect (); - break; - - case svc_effect2: - CL_ParseEffect2 (); - break; - - case 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) - CL_ExpandEntities(i); - 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) - CL_ExpandEntities(i); - CL_ParseBaseline (cl_entities + i, true); - break; - case svc_spawnstatic: - CL_ParseStatic (false); - break; - case svc_spawnstatic2: - CL_ParseStatic (true); - break; - case svc_temp_entity: - CL_ParseTempEntity (); - break; - - case svc_setpause: - cl.paused = MSG_ReadByte (); - if (cl.paused) - CDAudio_Pause (); - else - CDAudio_Resume (); - S_PauseGameSounds (cl.paused); - break; - - case svc_signonnum: - i = MSG_ReadByte (); - // LordHavoc: it's rude to kick off the client if they missed the - // reconnect somehow, so allow signon 1 even if at signon 1 - if (i <= cls.signon && i != 1) - Host_Error ("Received signon %i when at %i", i, cls.signon); - cls.signon = i; - CL_SignonReply (); - break; - - case svc_killedmonster: - cl.stats[STAT_MONSTERS]++; - break; - - case svc_foundsecret: - cl.stats[STAT_SECRETS]++; - break; - - case svc_updatestat: - i = MSG_ReadByte (); - if (i < 0 || i >= MAX_CL_STATS) - Host_Error ("svc_updatestat: %i is invalid", i); - cl.stats[i] = MSG_ReadLong (); - break; - - case svc_updatestatubyte: - i = MSG_ReadByte (); - if (i < 0 || i >= MAX_CL_STATS) - Host_Error ("svc_updatestat: %i is invalid", i); - cl.stats[i] = MSG_ReadByte (); - break; - - case svc_spawnstaticsound: - CL_ParseStaticSound (false); - break; - - case svc_spawnstaticsound2: - CL_ParseStaticSound (true); - break; - - case svc_cdtrack: - cl.cdtrack = MSG_ReadByte (); - cl.looptrack = MSG_ReadByte (); - if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) - CDAudio_Play ((qbyte)cls.forcetrack, true); - else - CDAudio_Play ((qbyte)cl.cdtrack, true); - break; - - case svc_intermission: - cl.intermission = 1; - cl.completed_time = cl.time; - break; - - case svc_finale: - cl.intermission = 2; - cl.completed_time = cl.time; - SCR_CenterPrint(MSG_ReadString ()); - break; - - case svc_cutscene: - cl.intermission = 3; - cl.completed_time = cl.time; - SCR_CenterPrint(MSG_ReadString ()); - break; - - case svc_sellscreen: - Cmd_ExecuteString ("help", src_command); - break; - case svc_hidelmp: - if (gamemode == GAME_TENEBRAE) - { - // repeating particle effect - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadByte(); - MSG_ReadLong(); - MSG_ReadLong(); - MSG_ReadString(); - } - else - SHOWLMP_decodehide(); - break; - case svc_showlmp: - if (gamemode == GAME_TENEBRAE) - { - // particle effect - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadCoord(cl.protocol); - MSG_ReadByte(); - MSG_ReadString(); - } - else - SHOWLMP_decodeshow(); - break; - 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) - { - // first update is the final signon stage - cls.signon = SIGNONS; + break; + + case svc_stopsound: + i = (unsigned short) MSG_ReadShort(); + S_StopSound(i>>3, i&7); + break; + + case svc_updatename: + i = MSG_ReadByte (); + if (i >= cl.maxclients) + Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); + strlcpy (cl.scores[i].name, MSG_ReadString (), sizeof (cl.scores[i].name)); + break; + + case svc_updatefrags: + i = MSG_ReadByte (); + if (i >= cl.maxclients) + Host_Error ("CL_ParseServerMessage: svc_updatefrags >= cl.maxclients"); + cl.scores[i].frags = (signed short) MSG_ReadShort (); + break; + + case svc_updatecolors: + i = MSG_ReadByte (); + if (i >= cl.maxclients) + Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients"); + cl.scores[i].colors = MSG_ReadByte (); + break; + + case svc_particle: + CL_ParseParticleEffect (); + break; + + case svc_effect: + CL_ParseEffect (); + break; + + case svc_effect2: + CL_ParseEffect2 (); + break; + + case 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) + CL_ExpandEntities(i); + 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) + CL_ExpandEntities(i); + CL_ParseBaseline (cl.entities + i, true); + break; + case svc_spawnstatic: + CL_ParseStatic (false); + break; + case svc_spawnstatic2: + CL_ParseStatic (true); + break; + case svc_temp_entity: + if(!CL_VM_Parse_TempEntity()) + CL_ParseTempEntity (); + break; + + case svc_setpause: + cl.paused = MSG_ReadByte (); + if (cl.paused) + CDAudio_Pause (); + else + CDAudio_Resume (); + S_PauseGameSounds (cl.paused); + break; + + case svc_signonnum: + i = MSG_ReadByte (); + // LordHavoc: it's rude to kick off the client if they missed the + // reconnect somehow, so allow signon 1 even if at signon 1 + if (i <= cls.signon && i != 1) + Host_Error ("Received signon %i when at %i", i, cls.signon); + cls.signon = i; CL_SignonReply (); + break; + + case svc_killedmonster: + cl.stats[STAT_MONSTERS]++; + break; + + case svc_foundsecret: + cl.stats[STAT_SECRETS]++; + break; + + case svc_updatestat: + i = MSG_ReadByte (); + if (i < 0 || i >= MAX_CL_STATS) + Host_Error ("svc_updatestat: %i is invalid", i); + cl.stats[i] = MSG_ReadLong (); + break; + + case svc_updatestatubyte: + i = MSG_ReadByte (); + if (i < 0 || i >= MAX_CL_STATS) + Host_Error ("svc_updatestat: %i is invalid", i); + cl.stats[i] = MSG_ReadByte (); + break; + + case svc_spawnstaticsound: + CL_ParseStaticSound (false); + break; + + case svc_spawnstaticsound2: + CL_ParseStaticSound (true); + break; + + case svc_cdtrack: + cl.cdtrack = MSG_ReadByte (); + cl.looptrack = MSG_ReadByte (); + if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) + CDAudio_Play ((unsigned char)cls.forcetrack, true); + else + CDAudio_Play ((unsigned char)cl.cdtrack, true); + break; + + case svc_intermission: + cl.intermission = 1; + cl.completed_time = cl.time; + break; + + case svc_finale: + cl.intermission = 2; + cl.completed_time = cl.time; + SCR_CenterPrint(MSG_ReadString ()); + break; + + case svc_cutscene: + cl.intermission = 3; + cl.completed_time = cl.time; + SCR_CenterPrint(MSG_ReadString ()); + break; + + case svc_sellscreen: + Cmd_ExecuteString ("help", src_command); + break; + case svc_hidelmp: + if (gamemode == GAME_TENEBRAE) + { + // repeating particle effect + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadByte(); + MSG_ReadLong(); + MSG_ReadLong(); + MSG_ReadString(); + } + else + SHOWLMP_decodehide(); + break; + case svc_showlmp: + if (gamemode == GAME_TENEBRAE) + { + // particle effect + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadCoord(cls.protocol); + MSG_ReadByte(); + MSG_ReadString(); + } + else + SHOWLMP_decodeshow(); + break; + case svc_skybox: + R_SetSkyBox(MSG_ReadString()); + break; + case svc_entities: + if (cls.signon == SIGNONS - 1) + { + // first update is the final signon stage + cls.signon = SIGNONS; + CL_SignonReply (); + } + if (cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3) + EntityFrame_CL_ReadFrame(); + else if (cls.protocol == PROTOCOL_DARKPLACES4) + EntityFrame4_CL_ReadFrame(); + else + EntityFrame5_CL_ReadFrame(); + break; + case svc_csqcentities: + CSQC_ReadEntities(); + break; } - if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3) - EntityFrame_CL_ReadFrame(); - else if (cl.protocol == PROTOCOL_DARKPLACES4) - EntityFrame4_CL_ReadFrame(); - else - EntityFrame5_CL_ReadFrame(); - break; } } - EntityFrameQuake_ISeeDeadEntities(); + CL_UpdateItemsAndWeapon(); - if (sendmove) - { - // send one move per server frame - CL_SendMove(); - } + EntityFrameQuake_ISeeDeadEntities(); parsingerror = false; } @@ -1757,6 +2992,17 @@ void CL_Parse_DumpPacket(void) parsingerror = false; } +void CL_Parse_ErrorCleanUp(void) +{ + if (cls.qw_downloadmemory) + { + Mem_Free(cls.qw_downloadmemory); + cls.qw_downloadmemory = NULL; + } + cls.qw_downloadpercent = 0; + QW_CL_StopUpload(); +} + void CL_Parse_Init(void) { // LordHavoc: added demo_nehahra cvar @@ -1764,6 +3010,19 @@ void CL_Parse_Init(void) if (gamemode == GAME_NEHAHRA) 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); + + 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"); } void CL_Parse_Shutdown(void)