X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=ecbe8f2bf621ffc593e3a692c5bfe82522418e17;hp=1f9506898b5fe2c94e942569871815a7e92af850;hb=4697d247f884b54564ab15189fa4dfb3420708e2;hpb=962f8548215542e25bff899fa6fab5ca3f9827ba diff --git a/cl_parse.c b/cl_parse.c index 1f950689..ecbe8f2b 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // cl_parse.c -- parse a message received from the server #include "quakedef.h" +#include "cdaudio.h" +#include "cl_collision.h" char *svc_strings[128] = { @@ -81,7 +83,7 @@ char *svc_strings[128] = "", // 48 "", // 49 "svc_cgame", // 50 // [short] length [bytes] data - "svc_unusedlh1", // 51 // unused + "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 "svc_sound2", // 54 // short soundindex instead of byte @@ -95,9 +97,7 @@ char *svc_strings[128] = //============================================================================= cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; - -qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments -int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces +cvar_t developer_networkentities = {0, "developer_networkentities", "0"}; /* ================== @@ -106,45 +106,57 @@ CL_ParseStartSoundPacket */ void CL_ParseStartSoundPacket(int largesoundindex) { - vec3_t pos; - int channel, ent; - int sound_num; - int volume; - int field_mask; - float attenuation; - int i; - - field_mask = MSG_ReadByte(); - - if (field_mask & SND_VOLUME) + vec3_t pos; + int channel, ent; + int sound_num; + int volume; + int field_mask; + float attenuation; + + field_mask = MSG_ReadByte(); + + if (field_mask & SND_VOLUME) volume = MSG_ReadByte (); else volume = DEFAULT_SOUND_PACKET_VOLUME; - - if (field_mask & SND_ATTENUATION) + + if (field_mask & SND_ATTENUATION) attenuation = MSG_ReadByte () / 64.0; else attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; - - channel = MSG_ReadShort (); - if (largesoundindex) + + 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 (); - if (sound_num >= MAX_SOUNDS) - Host_Error("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS); + MSG_ReadVector(pos, cl.protocol); - ent = channel >> 3; - channel &= 7; + if (sound_num >= MAX_SOUNDS) + { + Con_Printf("CL_ParseStartSoundPacket: sound_num (%i) >= MAX_SOUNDS (%i)\n", sound_num, MAX_SOUNDS); + return; + } - if (ent > MAX_EDICTS) - Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent); - - for (i=0 ; i<3 ; i++) - pos[i] = MSG_ReadCoord (); + if (ent >= MAX_EDICTS) + { + Con_Printf("CL_ParseStartSoundPacket: ent = %i", ent); + return; + } - S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation); + S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation); } /* @@ -155,59 +167,47 @@ When the client is taking a long time to load stuff, send keepalive messages so the server doesn't disconnect. ================== */ + +static qbyte olddata[NET_MAXMESSAGE]; void CL_KeepaliveMessage (void) { - float time; + float time; static float lastmsg; - int ret; - int c; - sizebuf_t old; - qbyte olddata[8192]; - - if (sv.active) - return; // no need if server is local - if (cls.demoplayback) + 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) return; // read messages from server, should just be nops + oldreadcount = msg_readcount; + oldbadread = msg_badread; old = net_message; - memcpy (olddata, net_message.data, net_message.cursize); - - do - { - ret = CL_GetMessage (); - switch (ret) - { - default: - Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed"); - case 0: - break; // nothing waiting - case 1: - Host_Error ("CL_KeepaliveMessage: received a message"); - break; - case 2: - c = MSG_ReadByte(); - if (c != svc_nop) - Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop"); - break; - } - } while (ret); + memcpy(olddata, net_message.data, net_message.cursize); - net_message = old; - memcpy (net_message.data, olddata, net_message.cursize); - -// check time - time = Sys_DoubleTime (); - if (time - lastmsg < 5) - return; - lastmsg = time; + NetConn_ClientFrame(); -// write out a nop - Con_Printf ("--> client to server keepalive\n"); + msg_readcount = oldreadcount; + msg_badread = oldbadread; + net_message = old; + memcpy(net_message.data, olddata, net_message.cursize); - MSG_WriteByte (&cls.message, clc_nop); - NET_SendMessage (cls.netcon, &cls.message); - SZ_Clear (&cls.message); + if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5) + { + sizebuf_t msg; + qbyte buf[4]; + lastmsg = time; + // write out a nop + // LordHavoc: must use unreliable because reliable could kill the sigon message! + Con_Print("--> client to server keepalive\n"); + msg.data = buf; + msg.maxsize = sizeof(buf); + msg.cursize = 0; + MSG_WriteChar(&msg, svc_nop); + NetConn_SendUnreliableMessage(cls.netcon, &msg); + } } void CL_ParseEntityLump(char *entdata) @@ -215,29 +215,30 @@ void CL_ParseEntityLump(char *entdata) const char *data; char key[128], value[4096]; FOG_clear(); // LordHavoc: no fog until set - R_SetSkyBox(""); // LordHavoc: no environment mapped sky 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)) + if (!COM_ParseToken(&data, false)) return; // error if (com_token[0] != '{') return; // error while (1) { - if (!COM_ParseToken(&data)) + if (!COM_ParseToken(&data, false)) return; // error if (com_token[0] == '}') break; // end of worldspawn if (com_token[0] == '_') - strcpy(key, com_token + 1); + strlcpy (key, com_token + 1, sizeof (key)); else - strcpy(key, com_token); + strlcpy (key, com_token, sizeof (key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken(&data)) + if (!COM_ParseToken(&data, false)) return; // error - strcpy(value, com_token); + strlcpy (value, com_token, sizeof (value)); if (!strcmp("sky", key)) R_SetSkyBox(value); else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh. @@ -268,7 +269,7 @@ static void CL_SignonReply (void) { //char str[8192]; -Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); +Con_DPrintf("CL_SignonReply: %i\n", cls.signon); switch (cls.signon) { @@ -289,10 +290,21 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); MSG_WriteByte (&cls.message, clc_stringcmd); MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer)); } + if (*cl_playermodel.string) + { + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("playermodel %s\n", cl_playermodel.string)); + } + if (*cl_playerskin.string) + { + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("playerskin %s\n", cl_playerskin.string)); + } + + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); MSG_WriteByte (&cls.message, clc_stringcmd); - //sprintf (str, "spawn %s", cls.spawnparms); - //MSG_WriteString (&cls.message, str); MSG_WriteString (&cls.message, "spawn"); break; @@ -312,17 +324,18 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); CL_ParseServerInfo ================== */ -qbyte entlife[MAX_EDICTS]; +// 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) { char *str; int i; int nummodels, numsounds; - char model_precache[MAX_MODELS][MAX_QPATH]; - char sound_precache[MAX_SOUNDS][MAX_QPATH]; entity_t *ent; - Con_DPrintf ("Serverinfo packet received.\n"); + Con_DPrint("Serverinfo packet received.\n"); + // // wipe the client_state_t struct // @@ -330,138 +343,133 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) + // hack for unmarked Nehahra movie demos which had a custom protocol + if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer) + i = PROTOCOL_NEHAHRAMOVIE; + if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_DARKPLACES6 && i != PROTOCOL_NEHAHRAMOVIE) { - Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); + Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE); return; } - Nehahrademcompatibility = false; - if (i == 250) - Nehahrademcompatibility = true; - if (cls.demoplayback && demo_nehahra.integer) - Nehahrademcompatibility = true; - dpprotocol = i; - if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) - dpprotocol = 0; + cl.protocol = i; + Con_DPrintf("Server protocol is %i\n", cl.protocol); // parse maxclients cl.maxclients = MSG_ReadByte (); if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD) { - Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients); + Host_Error("Bad maxclients (%u) from server\n", cl.maxclients); return; } - cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores)); + cl.scores = Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores)); // parse gametype cl.gametype = MSG_ReadByte (); // parse signon message str = MSG_ReadString (); - strncpy (cl.levelname, str, sizeof(cl.levelname)-1); + strlcpy (cl.levelname, str, sizeof(cl.levelname)); // seperate the printfs so the server message can have a color - if (!Nehahrademcompatibility) // 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"); - Con_Printf ("%c%s\n", 2, str); - } - -// -// first we go through and touch all of the precache data that still -// happens to be in the cache, so precaching something else doesn't -// needlessly purge it -// + 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); + // check memory integrity Mem_CheckSentinelsGlobal(); - Mod_ClearUsed(); + S_StopAllSounds(); + // if server is active, we already began a loading plaque + if (!sv.active) + SCR_BeginLoadingPlaque(); // disable until we get textures for it R_ResetSkyBox(); -// precache models - memset (cl.model_precache, 0, sizeof(cl.model_precache)); + memset(cl.model_precache, 0, sizeof(cl.model_precache)); + memset(cl.sound_precache, 0, sizeof(cl.sound_precache)); + + // parse model precache list for (nummodels=1 ; ; nummodels++) { - str = MSG_ReadString (); + str = MSG_ReadString(); if (!str[0]) break; if (nummodels==MAX_MODELS) - { Host_Error ("Server sent too many model precaches\n"); - return; - } if (strlen(str) >= MAX_QPATH) Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); - strcpy (model_precache[nummodels], str); - Mod_TouchModel (str); + strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels])); } - -// precache sounds - memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + // parse sound precache list for (numsounds=1 ; ; numsounds++) { - str = MSG_ReadString (); + str = MSG_ReadString(); if (!str[0]) break; if (numsounds==MAX_SOUNDS) - { - Host_Error ("Server sent too many sound precaches\n"); - return; - } + Host_Error("Server sent too many sound precaches\n"); if (strlen(str) >= MAX_QPATH) - Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); - strcpy (sound_precache[numsounds], str); - S_TouchSound (str); + 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])); } + // 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]); Mod_PurgeUnused(); -// -// now we try to load everything else until a cache allocation fails -// + // do the same for sounds + S_ServerSounds (parse_sound_precache, numsounds); + + // now we try to load everything that is new - for (i=1 ; istate_current.active = true; ent->render.model = cl.worldmodel = cl.model_precache[1]; - ent->render.scale = 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); - // clear entlife array - memset(entlife, 0, MAX_EDICTS); cl_num_entities = 1; - R_NewMap (); + R_Modules_NewMap(); CL_CGVM_Start(); - noclip_anglehack = false; // noclip is turned off at start + // noclip is turned off at start + noclip_anglehack = false; + // check memory integrity Mem_CheckSentinelsGlobal(); - } void CL_ValidateState(entity_state_t *s) @@ -475,19 +483,22 @@ void CL_ValidateState(entity_state_t *s) Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); // colormap is client index + 1 - if (s->colormap > cl.maxclients) - Host_Error ("CL_ValidateState: colormap (%i) > cl.maxclients (%i)", s->colormap, cl.maxclients); + 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]; Mod_CheckLoaded(model); - if (model && s->frame >= model->numframes) + if (model && model->type && s->frame >= model->numframes) { - Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name); + 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 && s->skin > 0 && s->skin >= model->numskins) + 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\"\n", s->skin, model->name); + Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\" (which has %i skins)\n", s->skin, model->name, model->numskins); s->skin = 0; } } @@ -495,24 +506,42 @@ void CL_ValidateState(entity_state_t *s) 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 || cls.timedemo || DotProduct(odelta, odelta) > 1000*1000 || cl_nolerp.integer) + if (!ent->state_previous.active || ent->state_previous.modelindex != ent->state_current.modelindex) { - // we definitely shouldn't lerp + // 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 (ent->state_current.flags & RENDER_STEP) + else if (cls.timedemo || cl_nolerp.integer || DotProduct(odelta, odelta) > 1000*1000) + { + // don't interpolate the move + 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); + } + else if (ent->state_current.flags & RENDER_STEP) { // monster interpolation - if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01 || cl.mtime[0] - ent->persistent.lerpstarttime >= 0.1) + if (DotProduct(odelta, odelta) + DotProduct(adelta, adelta) > 0.01) { - ent->persistent.lerpdeltatime = cl.time - ent->persistent.lerpstarttime; + ent->persistent.lerpdeltatime = bound(0, cl.mtime[1] - ent->persistent.lerpstarttime, 0.1); ent->persistent.lerpstarttime = cl.mtime[1]; VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin); VectorCopy(ent->persistent.newangles, ent->persistent.oldangles); @@ -520,175 +549,20 @@ void CL_MoveLerpEntityStates(entity_t *ent) VectorCopy(ent->state_current.angles, ent->persistent.newangles); } } - /* else { // not a monster - ent->persistent.lerpstarttime = cl.mtime[1]; + ent->persistent.lerpstarttime = ent->state_previous.time; // no lerp if it's singleplayer - //if (sv.active && svs.maxclients == 1 && !ent->state_current.flags & RENDER_STEP) - // ent->persistent.lerpdeltatime = 0; - //else - ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1]; + if (cl.islocalgame) + ent->persistent.lerpdeltatime = 0; + else + ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1); VectorCopy(ent->persistent.neworigin, ent->persistent.oldorigin); VectorCopy(ent->persistent.newangles, ent->persistent.oldangles); VectorCopy(ent->state_current.origin, ent->persistent.neworigin); VectorCopy(ent->state_current.angles, ent->persistent.newangles); } - */ -} - -/* -================== -CL_ParseUpdate - -Parse an entity update message from the server -If an entities model or origin changes from frame to frame, it must be -relinked. Other attributes can change without relinking. -================== -*/ -void CL_ParseUpdate (int bits) -{ - int num; - entity_t *ent; - entity_state_t new; - - if (bits & U_MOREBITS) - bits |= (MSG_ReadByte()<<8); - if ((bits & U_EXTEND1) && (!Nehahrademcompatibility)) - { - bits |= MSG_ReadByte() << 16; - if (bits & U_EXTEND2) - bits |= MSG_ReadByte() << 24; - } - - if (bits & U_LONGENTITY) - num = (unsigned) MSG_ReadShort (); - else - num = (unsigned) MSG_ReadByte (); - - if (num >= MAX_EDICTS) - Host_Error("CL_ParseUpdate: entity number (%i) >= MAX_EDICTS (%i)\n", num, MAX_EDICTS); - if (num < 1) - Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num); - - ent = cl_entities + num; - - // note: this inherits the 'active' state of the baseline chosen - // (state_baseline is always active, state_current may not be active if - // the entity was missing in the last frame) - if (bits & U_DELTA) - new = ent->state_current; - else - { - new = ent->state_baseline; - new.active = true; - } - - new.number = num; - new.time = cl.mtime[0]; - new.flags = 0; - if (bits & U_MODEL) new.modelindex = (new.modelindex & 0xFF00) | MSG_ReadByte(); - if (bits & U_FRAME) new.frame = (new.frame & 0xFF00) | MSG_ReadByte(); - if (bits & U_COLORMAP) new.colormap = MSG_ReadByte(); - if (bits & U_SKIN) new.skin = MSG_ReadByte(); - if (bits & U_EFFECTS) new.effects = (new.effects & 0xFF00) | MSG_ReadByte(); - if (bits & U_ORIGIN1) new.origin[0] = MSG_ReadCoord(); - if (bits & U_ANGLE1) new.angles[0] = MSG_ReadAngle(); - if (bits & U_ORIGIN2) new.origin[1] = MSG_ReadCoord(); - if (bits & U_ANGLE2) new.angles[1] = MSG_ReadAngle(); - if (bits & U_ORIGIN3) new.origin[2] = MSG_ReadCoord(); - if (bits & U_ANGLE3) new.angles[2] = MSG_ReadAngle(); - if (bits & U_STEP) new.flags |= RENDER_STEP; - if (bits & U_ALPHA) new.alpha = MSG_ReadByte(); - if (bits & U_SCALE) new.scale = MSG_ReadByte(); - if (bits & U_EFFECTS2) new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8); - if (bits & U_GLOWSIZE) new.glowsize = MSG_ReadByte(); - if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte(); - // apparently the dpcrush demo uses this (unintended, and it uses white anyway) - if (bits & U_COLORMOD) MSG_ReadByte(); - if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL; - if (bits & U_FRAME2) new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8); - if (bits & U_MODEL2) new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8); - if (bits & U_VIEWMODEL) new.flags |= RENDER_VIEWMODEL; - if (bits & U_EXTERIORMODEL) new.flags |= RENDER_EXTERIORMODEL; - - // LordHavoc: to allow playback of the Nehahra movie - if (Nehahrademcompatibility && (bits & U_EXTEND1)) - { - // LordHavoc: evil format - int i = MSG_ReadFloat(); - int j = MSG_ReadFloat() * 255.0f; - if (i == 2) - { - i = MSG_ReadFloat(); - if (i) - new.effects |= EF_FULLBRIGHT; - } - if (j < 0) - new.alpha = 0; - else if (j == 0 || j >= 255) - new.alpha = 255; - else - new.alpha = j; - } - - if (new.active) - CL_ValidateState(&new); - - ent->state_previous = ent->state_current; - ent->state_current = new; - if (ent->state_current.active) - { - CL_MoveLerpEntityStates(ent); - cl_entities_active[ent->state_current.number] = true; - // mark as visible (no kill this frame) - entlife[ent->state_current.number] = 2; - } -} - -void CL_ReadEntityFrame(void) -{ - entity_t *ent; - entity_frame_t entityframe; - int i; - EntityFrame_Read(&cl.entitydatabase); - EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe); - for (i = 0;i < entityframe.numentities;i++) - { - // copy the states - ent = &cl_entities[entityframe.entitydata[i].number]; - ent->state_previous = ent->state_current; - ent->state_current = entityframe.entitydata[i]; - CL_MoveLerpEntityStates(ent); - // the entity lives again... - entlife[ent->state_current.number] = 2; - cl_entities_active[ent->state_current.number] = true; - } - VectorCopy(cl.viewentoriginnew, cl.viewentoriginold); - VectorCopy(entityframe.eye, cl.viewentoriginnew); -} - -void CL_EntityUpdateSetup(void) -{ -} - -void CL_EntityUpdateEnd(void) -{ - int i; - // disable entities that disappeared this frame - for (i = 1;i < MAX_EDICTS;i++) - { - // clear only the entities that were active last frame but not this - // frame, don't waste time clearing all entities (which would cause - // cache misses) - if (entlife[i]) - { - entlife[i]--; - if (!entlife[i]) - cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; - } - } } /* @@ -700,7 +574,8 @@ void CL_ParseBaseline (entity_t *ent, int large) { int i; - memset(&ent->state_baseline, 0, sizeof(entity_state_t)); + ent->state_baseline = defaultstate; + // FIXME: set ent->state_baseline.number? ent->state_baseline.active = true; if (large) { @@ -716,16 +591,11 @@ 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 (); - ent->state_baseline.angles[i] = MSG_ReadAngle (); + ent->state_baseline.origin[i] = MSG_ReadCoord(cl.protocol); + ent->state_baseline.angles[i] = MSG_ReadAngle(cl.protocol); } - ent->state_baseline.alpha = 255; - ent->state_baseline.scale = 16; - ent->state_baseline.glowsize = 0; - ent->state_baseline.glowcolor = 254; - ent->state_previous = ent->state_current = ent->state_baseline; - CL_ValidateState(&ent->state_baseline); + ent->state_previous = ent->state_current = ent->state_baseline; } @@ -736,89 +606,140 @@ CL_ParseClientdata Server information pertaining to this client only ================== */ -void CL_ParseClientdata (int bits) +void CL_ParseClientdata (void) { - int i, j; + int i, j, bits; - bits &= 0xFFFF; + 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_DARKPLACES6) + { + cl.stats[STAT_VIEWHEIGHT] = DEFAULT_VIEWHEIGHT; + cl.stats[STAT_ITEMS] = 0; + cl.stats[STAT_VIEWZOOM] = 255; + } + cl.idealpitch = 0; + cl.mpunchangle[0][0] = 0; + cl.mpunchangle[0][1] = 0; + cl.mpunchangle[0][2] = 0; + cl.mpunchvector[0][0] = 0; + cl.mpunchvector[0][1] = 0; + cl.mpunchvector[0][2] = 0; + cl.mvelocity[0][0] = 0; + cl.mvelocity[0][1] = 0; + cl.mvelocity[0][2] = 0; + cl.mviewzoom[0] = 1; + + bits = (unsigned short) MSG_ReadShort (); if (bits & SU_EXTEND1) bits |= (MSG_ReadByte() << 16); if (bits & SU_EXTEND2) bits |= (MSG_ReadByte() << 24); if (bits & SU_VIEWHEIGHT) - cl.viewheight = MSG_ReadChar (); - else - cl.viewheight = DEFAULT_VIEWHEIGHT; + cl.stats[STAT_VIEWHEIGHT] = MSG_ReadChar (); if (bits & SU_IDEALPITCH) cl.idealpitch = MSG_ReadChar (); - else - cl.idealpitch = 0; - VectorCopy (cl.mvelocity[0], cl.mvelocity[1]); - for (i=0 ; i<3 ; i++) + for (i = 0;i < 3;i++) { if (bits & (SU_PUNCH1<render.skinnum = ent->state_baseline.skin; ent->render.effects = ent->state_baseline.effects; ent->render.alpha = 1; - ent->render.scale = 1; - ent->render.alpha = 1; + //ent->render.scale = 1; - VectorCopy (ent->state_baseline.origin, ent->render.origin); - VectorCopy (ent->state_baseline.angles, ent->render.angles); + //VectorCopy (ent->state_baseline.origin, ent->render.origin); + //VectorCopy (ent->state_baseline.angles, ent->render.angles); + Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1); + Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); CL_BoundingBoxForEntity(&ent->render); // This is definitely cheating... @@ -868,7 +790,7 @@ void CL_ParseStaticSound (int large) vec3_t org; int sound_num, vol, atten; - MSG_ReadVector(org); + MSG_ReadVector(org, cl.protocol); if (large) sound_num = (unsigned short) MSG_ReadShort (); else @@ -876,7 +798,7 @@ void CL_ParseStaticSound (int large) vol = MSG_ReadByte (); atten = MSG_ReadByte (); - S_StaticSound (cl.sound_precache[sound_num], org, vol, atten); + S_StaticSound (cl.sound_precache[sound_num], org, vol/255.0f, atten); } void CL_ParseEffect (void) @@ -884,7 +806,7 @@ void CL_ParseEffect (void) vec3_t org; int modelindex, startframe, framecount, framerate; - MSG_ReadVector(org); + MSG_ReadVector(org, cl.protocol); modelindex = MSG_ReadByte (); startframe = MSG_ReadByte (); framecount = MSG_ReadByte (); @@ -898,9 +820,9 @@ void CL_ParseEffect2 (void) vec3_t org; int modelindex, startframe, framecount, framerate; - MSG_ReadVector(org); - modelindex = MSG_ReadShort (); - startframe = MSG_ReadShort (); + MSG_ReadVector(org, cl.protocol); + modelindex = (unsigned short) MSG_ReadShort (); + startframe = (unsigned short) MSG_ReadShort (); framecount = MSG_ReadByte (); framerate = MSG_ReadByte (); @@ -927,24 +849,33 @@ CL_ParseTEnt */ void CL_InitTEnts (void) { - cl_sfx_wizhit = S_PrecacheSound ("wizard/hit.wav", false); - cl_sfx_knighthit = S_PrecacheSound ("hknight/hit.wav", false); - cl_sfx_tink1 = S_PrecacheSound ("weapons/tink1.wav", false); - cl_sfx_ric1 = S_PrecacheSound ("weapons/ric1.wav", false); - cl_sfx_ric2 = S_PrecacheSound ("weapons/ric2.wav", false); - cl_sfx_ric3 = S_PrecacheSound ("weapons/ric3.wav", false); - cl_sfx_r_exp3 = S_PrecacheSound ("weapons/r_exp3.wav", false); + 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); } -void CL_ParseBeam (model_t *m) +void CL_ParseBeam (model_t *m, int lightning) { int i, ent; vec3_t start, end; beam_t *b; - ent = MSG_ReadShort (); - MSG_ReadVector(start); - MSG_ReadVector(end); + ent = (unsigned short) MSG_ReadShort (); + MSG_ReadVector(start, cl.protocol); + MSG_ReadVector(end, cl.protocol); + + if (ent >= MAX_EDICTS) + { + Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent); + ent = 0; + } + + 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++) @@ -952,6 +883,8 @@ void CL_ParseBeam (model_t *m) if (b->entity == 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); @@ -966,6 +899,8 @@ void CL_ParseBeam (model_t *m) 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); @@ -973,10 +908,10 @@ void CL_ParseBeam (model_t *m) return; } } - Con_Printf ("beam list overflow!\n"); + Con_Print("beam list overflow!\n"); } -void CL_ParseTempEntity (void) +void CL_ParseTempEntity(void) { int type; vec3_t pos; @@ -987,264 +922,301 @@ void CL_ParseTempEntity (void) int colorStart, colorLength, count; float velspeed, radius; qbyte *tempcolor; + matrix4x4_t tempmatrix; - type = MSG_ReadByte (); + type = MSG_ReadByte(); switch (type) { case TE_WIZSPIKE: // spike hitting wall - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_RunParticleEffect (pos, vec3_origin, 20, 30); - S_StartSound (-1, 0, cl_sfx_wizhit, pos, 1, 1); + 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; case TE_KNIGHTSPIKE: // spike hitting wall - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_RunParticleEffect (pos, vec3_origin, 226, 20); - S_StartSound (-1, 0, cl_sfx_knighthit, pos, 1, 1); + 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 TE_SPIKE: // spike hitting wall - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - // LordHavoc: changed to spark shower - CL_SparkShower(pos, vec3_origin, 15); - if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); } break; case TE_SPIKEQUAD: // quad spike hitting wall - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); // LordHavoc: changed to spark shower - CL_SparkShower(pos, vec3_origin, 15); - CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); - if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); } break; case TE_SUPERSPIKE: // super spike hitting wall - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); // LordHavoc: changed to dust shower - CL_SparkShower(pos, vec3_origin, 30); - if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric3, pos, 1, 1); } break; case TE_SUPERSPIKEQUAD: // quad super spike hitting wall - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 4); // LordHavoc: changed to dust shower - CL_SparkShower(pos, vec3_origin, 30); - CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); - if ( rand() % 5 ) - S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_ric1, pos, 1, 1); else if (rnd == 2) - S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + S_StartSound(-1, 0, cl_sfx_ric2, pos, 1, 1); else - S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + 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); - dir[0] = MSG_ReadChar (); - dir[1] = MSG_ReadChar (); - dir[2] = MSG_ReadChar (); - count = MSG_ReadByte (); + 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_BLOOD2: - // blood puff - MSG_ReadVector(pos); - CL_BloodPuff(pos, vec3_origin, 10); - break; case TE_SPARK: // spark shower - MSG_ReadVector(pos); - dir[0] = MSG_ReadChar (); - dir[1] = MSG_ReadChar (); - dir[2] = MSG_ReadChar (); - count = MSG_ReadByte (); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_SparkShower(pos, dir, count); + 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); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + 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); // mins - MSG_ReadVector(pos2); // maxs - velspeed = MSG_ReadCoord (); // speed - count = MSG_ReadShort (); // number of particles + 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); // mins - MSG_ReadVector(pos2); // maxs - MSG_ReadVector(dir); // dir - count = MSG_ReadShort (); // number of particles - colorStart = MSG_ReadByte (); // color - colorLength = MSG_ReadByte (); // gravity (1 or 0) - velspeed = MSG_ReadCoord (); // randomvel + 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); // mins - MSG_ReadVector(pos2); // maxs - MSG_ReadVector(dir); // dir - count = MSG_ReadShort (); // number of particles - colorStart = MSG_ReadByte (); // color + 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); // mins - MSG_ReadVector(pos2); // maxs - MSG_ReadVector(dir); // dir - count = MSG_ReadShort (); // number of particles - colorStart = MSG_ReadByte (); // color + 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); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - // LordHavoc: changed to dust shower - CL_SparkShower(pos, vec3_origin, 15); + 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); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_SparkShower(pos, vec3_origin, 15); - CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); + 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; case TE_EXPLOSION: // rocket explosion - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_ParticleExplosion (pos, false); + 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 - CL_AllocDlight (NULL, pos, 350, 1.25f, 1.0f, 0.5f, 700, 0.5); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONQUAD: // quad rocket explosion - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_ParticleExplosion (pos, false); - CL_AllocDlight (NULL, pos, 600, 0.5f, 0.4f, 1.0f, 1200, 0.5); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSION3: // Nehahra movie colored lighting explosion - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_ParticleExplosion (pos, false); - CL_AllocDlight (NULL, pos, 350, MSG_ReadCoord(), MSG_ReadCoord(), MSG_ReadCoord(), 700, 0.5); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONRGB: // colored lighting explosion - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_ParticleExplosion (pos, false); - color[0] = MSG_ReadByte() * (1.0 / 255.0); - color[1] = MSG_ReadByte() * (1.0 / 255.0); - color[2] = MSG_ReadByte() * (1.0 / 255.0); - CL_AllocDlight (NULL, pos, 350, color[0], color[1], color[2], 700, 0.5); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); break; case TE_TAREXPLOSION: // tarbaby explosion - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_BlobExplosion (pos); - - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); - CL_AllocDlight (NULL, pos, 600, 0.8f, 0.4f, 1.0f, 1200, 0.5); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + MSG_ReadVector(pos, cl.protocol); + CL_FindNonSolidLocation(pos, pos, 10); + CL_BlobExplosion(pos); + + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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; case TE_SMALLFLASH: - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + 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_CUSTOMFLASH: - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - radius = MSG_ReadByte() * 8; + 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() * (1.0 / 255.0); - color[1] = MSG_ReadByte() * (1.0 / 255.0); - color[2] = MSG_ReadByte() * (1.0 / 255.0); - CL_AllocDlight (NULL, pos, radius, color[0], color[1], color[2], radius / velspeed, velspeed); + 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_FLAMEJET: - MSG_ReadVector(pos); - MSG_ReadVector(dir); + MSG_ReadVector(pos, cl.protocol); + MSG_ReadVector(dir, cl.protocol); count = MSG_ReadByte(); CL_Flames(pos, dir, count); break; @@ -1252,22 +1224,22 @@ void CL_ParseTempEntity (void) case TE_LIGHTNING1: // lightning bolts if (!cl_model_bolt) - cl_model_bolt = Mod_ForName("progs/bolt.mdl", true, false, false); - CL_ParseBeam (cl_model_bolt); + cl_model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + CL_ParseBeam(cl_model_bolt, true); break; case TE_LIGHTNING2: // lightning bolts if (!cl_model_bolt2) - cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", true, false, false); - CL_ParseBeam (cl_model_bolt2); + cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + CL_ParseBeam(cl_model_bolt2, true); break; case TE_LIGHTNING3: // lightning bolts if (!cl_model_bolt3) cl_model_bolt3 = Mod_ForName("progs/bolt3.mdl", true, false, false); - CL_ParseBeam (cl_model_bolt3); + CL_ParseBeam(cl_model_bolt3, false); break; // PGM 01/21/97 @@ -1275,48 +1247,83 @@ void CL_ParseTempEntity (void) // grappling hook beam if (!cl_model_beam) cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false); - CL_ParseBeam (cl_model_beam); + CL_ParseBeam(cl_model_beam, false); break; // PGM 01/21/97 // LordHavoc: for compatibility with the Nehahra movie... case TE_LIGHTNING4NEH: - CL_ParseBeam (Mod_ForName(MSG_ReadString(), true, false, false)); + CL_ParseBeam(Mod_ForName(MSG_ReadString(), true, false, false), false); break; case TE_LAVASPLASH: - pos[0] = MSG_ReadCoord (); - pos[1] = MSG_ReadCoord (); - pos[2] = MSG_ReadCoord (); - CL_LavaSplash (pos); + MSG_ReadVector(pos, cl.protocol); + CL_LavaSplash(pos); break; case TE_TELEPORT: - pos[0] = MSG_ReadCoord (); - pos[1] = MSG_ReadCoord (); - pos[2] = MSG_ReadCoord (); - CL_AllocDlight (NULL, pos, 1000, 1.25f, 1.25f, 1.25f, 3000, 99.0f); -// CL_TeleportSplash (pos); + 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_EXPLOSION2: // color mapped explosion - MSG_ReadVector(pos); - Mod_FindNonSolidLocation(pos, cl.worldmodel); - colorStart = MSG_ReadByte (); - colorLength = MSG_ReadByte (); - CL_ParticleExplosion2 (pos, colorStart, colorLength); - tempcolor = (qbyte *)&d_8to24table[(rand()%colorLength) + colorStart]; - CL_AllocDlight (NULL, pos, 350, tempcolor[0] * (1.0f / 255.0f), tempcolor[1] * (1.0f / 255.0f), tempcolor[2] * (1.0f / 255.0f), 700, 0.5); - S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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_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_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); + S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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; default: - Host_Error ("CL_ParseTempEntity: bad type %d", type); + Host_Error("CL_ParseTempEntity: bad type %d (hex %02X)", type, type); } } -#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x); +#define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x); static qbyte cgamenetbuffer[65536]; @@ -1325,29 +1332,36 @@ static qbyte cgamenetbuffer[65536]; CL_ParseServerMessage ===================== */ -void CL_ParseServerMessage (void) +int parsingerror = false; +void CL_ParseServerMessage(void) { int cmd; - int i, entitiesupdated; + int i; qbyte cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; + qboolean sendmove = false; + + if (cls.demorecording) + CL_WriteDemoMessage (); + + cl.last_received_message = realtime; // // if recording demos, copy the message out // if (cl_shownet.integer == 1) - Con_Printf ("%i ",net_message.cursize); + Con_Printf("%f %i\n", realtime, net_message.cursize); else if (cl_shownet.integer == 2) - Con_Printf ("------------------\n"); + Con_Print("------------------\n"); cl.onground = false; // unless the server says otherwise // // parse the message // - MSG_BeginReading (); + //MSG_BeginReading (); - entitiesupdated = false; + parsingerror = true; while (1) { @@ -1379,7 +1393,7 @@ void CL_ParseServerMessage (void) cls.signon = SIGNONS; CL_SignonReply (); } - CL_ParseUpdate (cmd&127); + EntityFrameQuake_ReadEntity (cmd&127); continue; } @@ -1399,7 +1413,7 @@ void CL_ParseServerMessage (void) { char description[32*64], temp[64]; int count; - strcpy(description, "packet dump: "); + strcpy (description, "packet dump: "); i = cmdcount - 32; if (i < 0) i = 0; @@ -1407,61 +1421,57 @@ void CL_ParseServerMessage (void) i &= 31; while(count > 0) { - sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]); - strcat(description, temp); + 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_Printf("%s", description); + Con_Print(description); Host_Error ("CL_ParseServerMessage: Illegible server message\n"); } break; case svc_nop: + if (cls.signon < SIGNONS) + Con_Print("<-- server to client keepalive\n"); break; case svc_time: - if (!entitiesupdated) - { - // this is a new frame, we'll be seeing entities, - // so prepare for entity updates - CL_EntityUpdateSetup(); - entitiesupdated = true; - } cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = MSG_ReadFloat (); + sendmove = true; break; case svc_clientdata: - i = MSG_ReadShort (); - CL_ParseClientdata (i); + CL_ParseClientdata(); break; case svc_version: i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) - Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); - Nehahrademcompatibility = false; - if (i == 250) - Nehahrademcompatibility = true; - if (cls.demoplayback && demo_nehahra.integer) - Nehahrademcompatibility = true; - dpprotocol = i; - if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) - dpprotocol = 0; + // hack for unmarked Nehahra movie demos which had a custom protocol + if (i == PROTOCOL_QUAKE && cls.demoplayback && demo_nehahra.integer) + i = PROTOCOL_NEHAHRAMOVIE; + if (i != PROTOCOL_QUAKE && i != PROTOCOL_DARKPLACES1 && i != PROTOCOL_DARKPLACES2 && i != PROTOCOL_DARKPLACES3 && i != PROTOCOL_DARKPLACES4 && i != PROTOCOL_DARKPLACES5 && i != PROTOCOL_DARKPLACES6 && i != PROTOCOL_NEHAHRAMOVIE) + Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE); + cl.protocol = i; break; case svc_disconnect: - Host_EndGame ("Server disconnected\n"); + Con_Printf ("Server disconnected\n"); + if (cls.demonum != -1) + CL_NextDemo (); + else + CL_Disconnect (); + break; case svc_print: - Con_Printf ("%s", MSG_ReadString ()); + Con_Print(MSG_ReadString()); break; case svc_centerprint: - SCR_CenterPrint (MSG_ReadString ()); + SCR_CenterPrint(MSG_ReadString ()); break; case svc_stufftext: @@ -1478,11 +1488,15 @@ void CL_ParseServerMessage (void) case svc_setangle: for (i=0 ; i<3 ; i++) - cl.viewangles[i] = MSG_ReadAngle (); + cl.viewangles[i] = MSG_ReadAngle (cl.protocol); break; case svc_setview: - cl.viewentity = MSG_ReadShort (); + 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; @@ -1492,7 +1506,7 @@ void CL_ParseServerMessage (void) i = MSG_ReadByte (); if (i >= MAX_LIGHTSTYLES) Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); - strncpy (cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING - 1); + 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; @@ -1501,12 +1515,46 @@ void CL_ParseServerMessage (void) CL_ParseStartSoundPacket(false); break; - case svc_sound2: - CL_ParseStartSoundPacket(true); + case svc_precache: + if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.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) + { + 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 + { + 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 = MSG_ReadShort(); + i = (unsigned short) MSG_ReadShort(); S_StopSound(i>>3, i&7); break; @@ -1514,14 +1562,14 @@ void CL_ParseServerMessage (void) i = MSG_ReadByte (); if (i >= cl.maxclients) Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); - strcpy (cl.scores[i].name, MSG_ReadString ()); + 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 = MSG_ReadShort (); + cl.scores[i].frags = (signed short) MSG_ReadShort (); break; case svc_updatecolors: @@ -1529,9 +1577,6 @@ void CL_ParseServerMessage (void) if (i >= cl.maxclients) Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients"); cl.scores[i].colors = MSG_ReadByte (); - // update our color cvar if our color changed - if (i == cl.playerentity - 1) - Cvar_SetValue ("_cl_color", cl.scores[i].colors); break; case svc_particle: @@ -1547,15 +1592,19 @@ void CL_ParseServerMessage (void) break; case svc_spawnbaseline: - i = MSG_ReadShort (); + 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 = MSG_ReadShort (); + 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: @@ -1574,11 +1623,14 @@ void CL_ParseServerMessage (void) CDAudio_Pause (); else CDAudio_Resume (); + S_PauseGameSounds (cl.paused); break; case svc_signonnum: i = MSG_ReadByte (); - if (i <= cls.signon) + // 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 (); @@ -1599,6 +1651,13 @@ void CL_ParseServerMessage (void) 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; @@ -1624,23 +1683,48 @@ void CL_ParseServerMessage (void) case svc_finale: cl.intermission = 2; cl.completed_time = cl.time; - SCR_CenterPrint (MSG_ReadString ()); + SCR_CenterPrint(MSG_ReadString ()); break; case svc_cutscene: cl.intermission = 3; cl.completed_time = cl.time; - SCR_CenterPrint (MSG_ReadString ()); + SCR_CenterPrint(MSG_ReadString ()); break; case svc_sellscreen: Cmd_ExecuteString ("help", src_command); break; case svc_hidelmp: - SHOWLMP_decodehide(); + 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: - SHOWLMP_decodeshow(); + 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()); @@ -1662,13 +1746,36 @@ void CL_ParseServerMessage (void) cls.signon = SIGNONS; CL_SignonReply (); } - CL_ReadEntityFrame(); + 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 if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6) + EntityFrame5_CL_ReadFrame(); + else + Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol); break; } } - if (entitiesupdated) - CL_EntityUpdateEnd(); + EntityFrameQuake_ISeeDeadEntities(); + + if (sendmove) + { + // send one move per server frame + CL_SendMove(); + } + + parsingerror = false; +} + +void CL_Parse_DumpPacket(void) +{ + if (!parsingerror) + return; + Con_Print("Packet dump:\n"); + SZ_HexDumpToConsole(&net_message); + parsingerror = false; } void CL_Parse_Init(void) @@ -1677,4 +1784,9 @@ void CL_Parse_Init(void) Cvar_RegisterVariable (&demo_nehahra); if (gamemode == GAME_NEHAHRA) Cvar_SetValue("demo_nehahra", 1); + Cvar_RegisterVariable(&developer_networkentities); +} + +void CL_Parse_Shutdown(void) +{ }