X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=7b68ddefcc37c1300a14f7dc2426636bd22a0783;hb=7d0ec7ce187f7333a7ada2884108757a4fec6449;hp=75d53fe7dec5bfa883829778a57c4b86b0ce2afb;hpb=9f6e4476fe8049342ac61c87ab7286912c1ff97c;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 75d53fe7..7b68ddef 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -char *svc_strings[] = +char *svc_strings[128] = { "svc_bad", "svc_nop", @@ -65,28 +65,39 @@ char *svc_strings[] = "svc_cdtrack", // [byte] track [byte] looptrack "svc_sellscreen", "svc_cutscene", - "svc_showlmp", // [string] iconlabel [string] lmpfile [byte] x [byte] y + "svc_showlmp", // [string] iconlabel [string] lmpfile [short] x [short] y "svc_hidelmp", // [string] iconlabel "svc_skybox", // [string] skyname - "?", // 38 - "?", // 39 - "?", // 40 - "?", // 41 - "?", // 42 - "?", // 43 - "?", // 44 - "?", // 45 - "?", // 46 - "?", // 47 - "?", // 48 - "?", // 49 - "svc_farclip", // [coord] size - "svc_fog", // [byte] enable [short * 4096] density [byte] red [byte] green [byte] blue - "svc_playerposition" // [float] x [float] y [float] z + "", // 38 + "", // 39 + "", // 40 + "", // 41 + "", // 42 + "", // 43 + "", // 44 + "", // 45 + "", // 46 + "", // 47 + "", // 48 + "", // 49 + "", // 50 + "svc_fog", // 51 + "svc_effect", // [vector] org [byte] modelindex [byte] startframe [byte] framecount [byte] framerate + "svc_effect2", // [vector] org [short] modelindex [short] startframe [byte] framecount [byte] framerate }; //============================================================================= +cvar_t demo_nehahra = {"demo_nehahra", "0"}; + +void CL_Parse_Init(void) +{ + // LordHavoc: added demo_nehahra cvar + Cvar_RegisterVariable (&demo_nehahra); + if (nehahra) + Cvar_SetValue("demo_nehahra", 1); +} + qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments qboolean dpprotocol; // LordHavoc: whether or not the current network stream is the enhanced DarkPlaces protocol @@ -99,16 +110,21 @@ This error checks and tracks the total number of entities */ entity_t *CL_EntityNum (int num) { + /* if (num >= cl.num_entities) { if (num >= MAX_EDICTS) Host_Error ("CL_EntityNum: %i is an invalid number",num); - while (cl.num_entities<=num) - { - cl_entities[cl.num_entities].colormap = 0; //vid.colormap; - cl.num_entities++; - } + cl.num_entities = num; +// while (cl.num_entities <= num) +// { +// cl_entities[cl.num_entities].colormap = -1; // no special coloring +// cl.num_entities++; +// } } + */ + if (num >= MAX_EDICTS) + Host_Error ("CL_EntityNum: %i is an invalid number",num); return &cl_entities[num]; } @@ -119,14 +135,14 @@ entity_t *CL_EntityNum (int num) CL_ParseStartSoundPacket ================== */ -void CL_ParseStartSoundPacket(void) +void CL_ParseStartSoundPacket(int largesoundindex) { vec3_t pos; int channel, ent; int sound_num; int volume; int field_mask; - float attenuation; + float attenuation; int i; field_mask = MSG_ReadByte(); @@ -142,7 +158,13 @@ void CL_ParseStartSoundPacket(void) attenuation = DEFAULT_SOUND_PACKET_ATTENUATION; channel = MSG_ReadShort (); - sound_num = MSG_ReadByte (); + if (largesoundindex) + 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); ent = channel >> 3; channel &= 7; @@ -204,7 +226,7 @@ void CL_KeepaliveMessage (void) memcpy (net_message.data, olddata, net_message.cursize); // check time - time = Sys_FloatTime (); + time = Sys_DoubleTime (); if (time - lastmsg < 5) return; lastmsg = time; @@ -217,24 +239,14 @@ void CL_KeepaliveMessage (void) SZ_Clear (&cls.message); } -extern qboolean isworldmodel; -extern char skyname[]; -extern float fog_density; -extern float fog_red; -extern float fog_green; -extern float fog_blue; -extern void R_SetSkyBox (char *sky); -extern void FOG_clear(); -extern cvar_t r_farclip; - void CL_ParseEntityLump(char *entdata) { char *data; - char key[128], value[1024]; + char key[128], value[4096]; char wadname[128]; int i, j, k; FOG_clear(); // LordHavoc: no fog until set - skyname[0] = 0; // LordHavoc: no enviroment mapped sky until set + R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set r_farclip.value = 6144; // LordHavoc: default farclip distance data = entdata; if (!data) @@ -285,27 +297,30 @@ void CL_ParseEntityLump(char *entdata) fog_blue = atof(value); else if (!strcmp("wad", key)) // for HalfLife maps { - j = 0; - for (i = 0;i < 128;i++) - if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':') - break; - if (value[i]) + if (hlbsp) { - for (;i < 128;i++) + j = 0; + for (i = 0;i < 4096;i++) + if (value[i] != ';' && value[i] != '\\' && value[i] != '/' && value[i] != ':') + break; + if (value[i]) { - // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'... - if (value[i] == '\\' || value[i] == '/' || value[i] == ':') - j = i+1; - else if (value[i] == ';' || value[i] == 0) + for (;i < 4096;i++) { - k = value[i]; - value[i] = 0; - strcpy(wadname, "textures/"); - strcat(wadname, &value[j]); - W_LoadTextureWadFile (wadname, FALSE); - j = i+1; - if (!k) - break; + // ignore path - the \\ check is for HalfLife... stupid windoze 'programmers'... + if (value[i] == '\\' || value[i] == '/' || value[i] == ':') + j = i+1; + else if (value[i] == ';' || value[i] == 0) + { + k = value[i]; + value[i] = 0; + strcpy(wadname, "textures/"); + strcat(wadname, &value[j]); + W_LoadTextureWadFile (wadname, false); + j = i+1; + if (!k) + break; + } } } } @@ -318,7 +333,6 @@ void CL_ParseEntityLump(char *entdata) CL_ParseServerInfo ================== */ -extern cvar_t demo_nehahra; void CL_ParseServerInfo (void) { char *str; @@ -335,9 +349,9 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != 250) + if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250) { - Con_Printf ("Server returned version %i, not %i", i, PROTOCOL_VERSION); + Con_Printf ("Server returned version %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION); return; } Nehahrademcompatibility = false; @@ -388,6 +402,8 @@ void CL_ParseServerInfo (void) Con_Printf ("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); } @@ -404,6 +420,8 @@ void CL_ParseServerInfo (void) Con_Printf ("Server sent too many sound 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 (sound_precache[numsounds], str); S_TouchSound (str); } @@ -434,7 +452,7 @@ void CL_ParseServerInfo (void) // local state - cl_entities[0].model = cl.worldmodel = cl.model_precache[1]; + cl_entities[0].render.model = cl.worldmodel = cl.model_precache[1]; R_NewMap (); @@ -443,6 +461,27 @@ void CL_ParseServerInfo (void) noclip_anglehack = false; // noclip is turned off at start } +void CL_ValidateState(entity_state_t *s) +{ + model_t *model; + + if (!s->active) + return; + + if (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->colormap > cl.maxclients) + Host_Error ("CL_ValidateState: colormap (%i) > cl.maxclients (%i)", s->colormap, cl.maxclients); + + model = cl.model_precache[s->modelindex]; + if (model && s->frame >= model->numframes) + { + Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name); + s->frame = 0; + } +} /* ================== @@ -453,15 +492,12 @@ If an entities model or origin changes from frame to frame, it must be relinked. Other attributes can change without relinking. ================== */ -//int bitcounts[16]; - +byte entkill[MAX_EDICTS]; +int bitprofile[32], bitprofilecount = 0; void CL_ParseUpdate (int bits) { - int i, modnum, num, skin, alpha, scale, glowsize, glowcolor, colormod; - model_t *model; - qboolean forcelink; - entity_t *ent; - entity_state_t *baseline; + int i, num, deltadie; + entity_t *ent; if (cls.signon == SIGNONS - 1) { // first update is the final signon stage @@ -470,11 +506,8 @@ void CL_ParseUpdate (int bits) } if (bits & U_MOREBITS) - { - i = MSG_ReadByte (); - bits |= (i<<8); - } - if (bits & U_EXTEND1 && !Nehahrademcompatibility) + bits |= (MSG_ReadByte()<<8); + if ((bits & U_EXTEND1) && (!Nehahrademcompatibility)) { bits |= MSG_ReadByte() << 16; if (bits & U_EXTEND2) @@ -482,152 +515,212 @@ void CL_ParseUpdate (int bits) } if (bits & U_LONGENTITY) - num = MSG_ReadShort (); + num = (unsigned) MSG_ReadShort (); else - num = MSG_ReadByte (); + num = (unsigned) MSG_ReadByte (); - ent = CL_EntityNum (num); + 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); + + // mark as visible (no kill) + entkill[num] = 0; -//for (i=0 ; i<16 ; i++) -//if (bits&(1<msgtime != cl.mtime[1]; // no previous frame to lerp from + for (i = 0;i < 32;i++) + if (bits & (1 << i)) + bitprofile[i]++; + bitprofilecount++; - ent->msgtime = cl.mtime[0]; - - // LordHavoc: new protocol stuff - baseline = &ent->baseline; + ent->state_previous = ent->state_current; + deltadie = false; if (bits & U_DELTA) - baseline = &ent->deltabaseline; - - modnum = bits & U_MODEL ? MSG_ReadByte() : baseline->modelindex; - if (modnum >= MAX_MODELS) - Host_Error ("CL_ParseModel: bad modnum"); - ent->deltabaseline.modelindex = modnum; - - model = cl.model_precache[modnum]; - if (model != ent->model) { - ent->model = model; - // automatic animation (torches, etc) can be either all together - // or randomized - if (model) - ent->syncbase = model->synctype == ST_RAND ? (float)(rand()&0x7fff) / 0x7fff : 0.0; - else - forcelink = true; // hack to make null model players work - if (num > 0 && num <= cl.maxclients) - R_TranslatePlayerSkin(num - 1); + if (!ent->state_current.active) + deltadie = true; // was not present in previous frame, leave hidden until next full update } - - ent->frame = ((bits & U_FRAME) ? MSG_ReadByte() : (baseline->frame & 0xFF)); - - i = bits & U_COLORMAP ? MSG_ReadByte() : baseline->colormap; - ent->deltabaseline.colormap = i; - if (!i) - ent->colormap = 0; //vid.colormap; else + ent->state_current = ent->state_baseline; + + ent->state_current.time = cl.mtime[0]; + + ent->state_current.flags = 0; + ent->state_current.active = true; + if (bits & U_MODEL) ent->state_current.modelindex = (ent->state_current.modelindex & 0xFF00) | MSG_ReadByte(); + if (bits & U_FRAME) ent->state_current.frame = (ent->state_current.frame & 0xFF00) | MSG_ReadByte(); + if (bits & U_COLORMAP) ent->state_current.colormap = MSG_ReadByte(); + if (bits & U_SKIN) ent->state_current.skin = MSG_ReadByte(); + if (bits & U_EFFECTS) ent->state_current.effects = (ent->state_current.effects & 0xFF00) | MSG_ReadByte(); + if (bits & U_ORIGIN1) ent->state_current.origin[0] = MSG_ReadCoord(); + if (bits & U_ANGLE1) ent->state_current.angles[0] = MSG_ReadAngle(); + if (bits & U_ORIGIN2) ent->state_current.origin[1] = MSG_ReadCoord(); + if (bits & U_ANGLE2) ent->state_current.angles[1] = MSG_ReadAngle(); + if (bits & U_ORIGIN3) ent->state_current.origin[2] = MSG_ReadCoord(); + if (bits & U_ANGLE3) ent->state_current.angles[2] = MSG_ReadAngle(); + if (bits & U_STEP) ent->state_current.flags |= RENDER_STEP; + if (bits & U_ALPHA) ent->state_current.alpha = MSG_ReadByte(); + if (bits & U_SCALE) ent->state_current.scale = MSG_ReadByte(); + if (bits & U_EFFECTS2) ent->state_current.effects = (ent->state_current.effects & 0x00FF) | (MSG_ReadByte() << 8); + if (bits & U_GLOWSIZE) ent->state_current.glowsize = MSG_ReadByte(); + if (bits & U_GLOWCOLOR) ent->state_current.glowcolor = MSG_ReadByte(); + if (bits & U_GLOWTRAIL) ent->state_current.flags |= RENDER_GLOWTRAIL; + if (bits & U_COLORMOD) ent->state_current.colormod = MSG_ReadByte(); + if (bits & U_FRAME2) ent->state_current.frame = (ent->state_current.frame & 0x00FF) | (MSG_ReadByte() << 8); + if (bits & U_MODEL2) ent->state_current.modelindex = (ent->state_current.modelindex & 0x00FF) | (MSG_ReadByte() << 8); + if (bits & U_VIEWMODEL) ent->state_current.flags |= RENDER_VIEWMODEL; + if (bits & U_EXTERIORMODEL) ent->state_current.flags |= RENDER_EXTERIORMODEL; + + // LordHavoc: to allow playback of the Nehahra movie + if (Nehahrademcompatibility && (bits & U_EXTEND1)) { - if (i > cl.maxclients) - Host_Error ("i >= cl.maxclients"); - ent->colormap = i; //vid.colormap; // cl.scores[i-1].translations; + // LordHavoc: evil format + int i = MSG_ReadFloat(); + int j = MSG_ReadFloat() * 255.0f; + if (i == 2) + { + if (MSG_ReadFloat()) + ent->state_current.effects |= EF_FULLBRIGHT; + } + if (j < 0) + ent->state_current.alpha = 0; + else if (j == 0 || j >= 255) + ent->state_current.alpha = 255; + else + ent->state_current.alpha = j; } - skin = bits & U_SKIN ? MSG_ReadByte() : baseline->skin; - if (skin != ent->skinnum) + if (deltadie) { - ent->skinnum = skin; - if (num > 0 && num <= cl.maxclients) - R_TranslatePlayerSkin(num - 1); + // hide the entity + ent->state_current.active = false; } - ent->deltabaseline.skin = skin; - - ent->effects = ((bits & U_EFFECTS) ? MSG_ReadByte() : (baseline->effects & 0xFF)); - -// shift the known values for interpolation - VectorCopy (ent->msg_origins[0], ent->msg_origins[1]); - VectorCopy (ent->msg_angles[0], ent->msg_angles[1]); - VectorCopy (baseline->origin, ent->msg_origins[0]); - VectorCopy (baseline->angles, ent->msg_angles[0]); - - if (bits & U_ORIGIN1) ent->msg_origins[0][0] = MSG_ReadCoord (); - if (bits & U_ANGLE1) ent->msg_angles[0][0] = MSG_ReadAngle(); - if (bits & U_ORIGIN2) ent->msg_origins[0][1] = MSG_ReadCoord (); - if (bits & U_ANGLE2) ent->msg_angles[0][1] = MSG_ReadAngle(); - if (bits & U_ORIGIN3) ent->msg_origins[0][2] = MSG_ReadCoord (); - if (bits & U_ANGLE3) ent->msg_angles[0][2] = MSG_ReadAngle(); - - VectorCopy(ent->msg_origins[0], ent->deltabaseline.origin); - VectorCopy(ent->msg_angles[0], ent->deltabaseline.angles); - - alpha = bits & U_ALPHA ? MSG_ReadByte() : baseline->alpha; - scale = bits & U_SCALE ? MSG_ReadByte() : baseline->scale; - ent->effects |= ((bits & U_EFFECTS2) ? (MSG_ReadByte() << 8) : (baseline->effects & 0xFF00)); - glowsize = bits & U_GLOWSIZE ? MSG_ReadByte() : baseline->glowsize; - glowcolor = bits & U_GLOWCOLOR ? MSG_ReadByte() : baseline->glowcolor; - colormod = bits & U_COLORMOD ? MSG_ReadByte() : baseline->colormod; - ent->frame |= ((bits & U_FRAME2) ? (MSG_ReadByte() << 8) : (baseline->frame & 0xFF00)); - ent->deltabaseline.alpha = alpha; - ent->deltabaseline.scale = scale; - ent->deltabaseline.effects = ent->effects; - ent->deltabaseline.glowsize = glowsize; - ent->deltabaseline.glowcolor = glowcolor; - ent->deltabaseline.colormod = colormod; - ent->deltabaseline.frame = ent->frame; - ent->alpha = (float) alpha * (1.0 / 255.0); - ent->scale = (float) scale * (1.0 / 16.0); - ent->glowsize = glowsize * 4.0; - ent->glowcolor = glowcolor; - ent->colormod[0] = (float) ((colormod >> 5) & 7) * (1.0 / 7.0); - ent->colormod[1] = (float) ((colormod >> 2) & 7) * (1.0 / 7.0); - ent->colormod[2] = (float) (colormod & 3) * (1.0 / 3.0); - if (bits & U_EXTEND1 && Nehahrademcompatibility) // LordHavoc: to allow playback of the early Nehahra movie segments + else { - i = MSG_ReadFloat(); - ent->alpha = MSG_ReadFloat(); - if (i == 2 && MSG_ReadFloat() != 0.0) - ent->effects |= EF_FULLBRIGHT; - if (ent->alpha == 0) - ent->alpha = 1; - } + CL_ValidateState(&ent->state_current); - //if ( bits & U_NOLERP ) - // ent->forcelink = true; - //if (bits & U_STEP) // FIXME: implement clientside interpolation of monsters - - if ( forcelink ) - { // didn't have an update last message - VectorCopy (ent->msg_origins[0], ent->msg_origins[1]); - VectorCopy (ent->msg_origins[0], ent->origin); - VectorCopy (ent->msg_angles[0], ent->msg_angles[1]); - VectorCopy (ent->msg_angles[0], ent->angles); - ent->forcelink = true; + /* + if (!ent->state_current.active) + { + if (bits & U_DELTA) + { + if (bits & U_MODEL) + Con_Printf("CL_ParseUpdate: delta NULL model on %i: %i %i\n", num, ent->state_previous.modelindex, ent->state_current.modelindex); + else + Con_Printf("CL_ParseUpdate: delta NULL model on %i: %i\n", num, ent->state_previous.modelindex); + } + else + { + if (bits & U_MODEL) + Con_Printf("CL_ParseUpdate: NULL model on %i: %i %i\n", num, ent->state_baseline.modelindex, ent->state_current.modelindex); + else + Con_Printf("CL_ParseUpdate: NULL model on %i: %i\n", num, ent->state_baseline.modelindex); + } + } + */ } } +char *bitprofilenames[32] = +{ + "U_MOREBITS", + "U_ORIGIN1", + "U_ORIGIN2", + "U_ORIGIN3", + "U_ANGLE2", + "U_STEP", + "U_FRAME", + "U_SIGNAL", + "U_ANGLE1", + "U_ANGLE3", + "U_MODEL", + "U_COLORMAP", + "U_SKIN", + "U_EFFECTS", + "U_LONGENTITY", + "U_EXTEND1", + "U_DELTA", + "U_ALPHA", + "U_SCALE", + "U_EFFECTS2", + "U_GLOWSIZE", + "U_GLOWCOLOR", + "U_COLORMOD", + "U_EXTEND2", + "U_GLOWTRAIL", + "U_VIEWMODEL", + "U_FRAME2", + "U_MODEL2", + "U_EXTERIORMODEL", + "U_UNUSED29", + "U_UNUSED30", + "U_EXTEND3", +}; + +void CL_BitProfile_f(void) +{ + int i; + Con_Printf("bitprofile: %i updates\n"); + if (bitprofilecount) + for (i = 0;i < 32;i++) +// if (bitprofile[i]) + Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount); + Con_Printf("\n"); + for (i = 0;i < 32;i++) + bitprofile[i] = 0; + bitprofilecount = 0; +} + +void CL_EntityUpdateSetup(void) +{ + memset(entkill, 1, MAX_EDICTS); +} + +void CL_EntityUpdateEnd(void) +{ + int i; + for (i = 1;i < MAX_EDICTS;i++) + if (entkill[i]) + cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; +} + /* ================== CL_ParseBaseline ================== */ -void CL_ParseBaseline (entity_t *ent) +void CL_ParseBaseline (entity_t *ent, int large) { - int i; - - ent->baseline.modelindex = MSG_ReadByte (); - ent->baseline.frame = MSG_ReadByte (); - ent->baseline.colormap = MSG_ReadByte(); - ent->baseline.skin = MSG_ReadByte(); - for (i=0 ; i<3 ; i++) + int i; + + memset(&ent->state_baseline, 0, sizeof(entity_state_t)); + ent->state_baseline.active = true; + if (large) + { + ent->state_baseline.modelindex = (unsigned short) MSG_ReadShort (); + ent->state_baseline.frame = (unsigned short) MSG_ReadShort (); + } + else { - ent->baseline.origin[i] = MSG_ReadCoord (); - ent->baseline.angles[i] = MSG_ReadAngle (); + ent->state_baseline.modelindex = MSG_ReadByte (); + ent->state_baseline.frame = MSG_ReadByte (); } - ent->baseline.alpha = 255; - ent->baseline.scale = 16; - ent->baseline.glowsize = 0; - ent->baseline.glowcolor = 254; - ent->baseline.colormod = 255; + ent->state_baseline.colormap = MSG_ReadByte(); + 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.alpha = 255; + ent->state_baseline.scale = 16; + ent->state_baseline.glowsize = 0; + ent->state_baseline.glowcolor = 254; + ent->state_baseline.colormod = 255; + ent->state_previous = ent->state_current = ent->state_baseline; + + CL_ValidateState(&ent->state_baseline); } @@ -640,8 +733,14 @@ Server information pertaining to this client only */ void CL_ParseClientdata (int bits) { - int i, j; - + int i, j; + + bits &= 0xFFFF; + 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 @@ -656,21 +755,27 @@ void CL_ParseClientdata (int bits) for (i=0 ; i<3 ; i++) { if (bits & (SU_PUNCH1<= MAX_STATIC_ENTITIES) + if (cl.num_statics >= MAX_STATIC_ENTITIES) Host_Error ("Too many static entities"); - ent = &cl_static_entities[i]; - cl.num_statics++; - CL_ParseBaseline (ent); + ent = &cl_static_entities[cl.num_statics++]; + CL_ParseBaseline (ent, large); // copy it to the current state - ent->model = cl.model_precache[ent->baseline.modelindex]; - ent->frame = ent->baseline.frame; - ent->colormap = 0; //vid.colormap; - ent->skinnum = ent->baseline.skin; - ent->effects = ent->baseline.effects; - ent->alpha = 1; - ent->scale = 1; - ent->alpha = 1; - ent->glowsize = 0; - ent->glowcolor = 254; - ent->colormod[0] = ent->colormod[1] = ent->colormod[2] = 1; - - VectorCopy (ent->baseline.origin, ent->origin); - VectorCopy (ent->baseline.angles, ent->angles); - R_AddEfrags (ent); + ent->render.model = cl.model_precache[ent->state_baseline.modelindex]; + ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_baseline.frame; + ent->render.framelerp = 0; + ent->render.lerp_starttime = -1; + // make torchs play out of sync + ent->render.frame1start = ent->render.frame2start = -(rand() & 32767); + ent->render.colormap = -1; // no special coloring + ent->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.colormod[0] = ent->render.colormod[1] = ent->render.colormod[2] = 1; + + VectorCopy (ent->state_baseline.origin, ent->render.origin); + VectorCopy (ent->state_baseline.angles, ent->render.angles); } /* @@ -789,32 +842,52 @@ void CL_ParseStatic (void) CL_ParseStaticSound =================== */ -void CL_ParseStaticSound (void) +void CL_ParseStaticSound (int large) { vec3_t org; int sound_num, vol, atten; - int i; - - for (i=0 ; i<3 ; i++) - org[i] = MSG_ReadCoord (); - sound_num = MSG_ReadByte (); + + MSG_ReadVector(org); + if (large) + sound_num = (unsigned short) MSG_ReadShort (); + else + sound_num = MSG_ReadByte (); vol = MSG_ReadByte (); atten = MSG_ReadByte (); S_StaticSound (cl.sound_precache[sound_num], org, vol, atten); } +void CL_ParseEffect (void) +{ + vec3_t org; + int modelindex, startframe, framecount, framerate; -#define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x); + MSG_ReadVector(org); + modelindex = MSG_ReadByte (); + startframe = MSG_ReadByte (); + framecount = MSG_ReadByte (); + framerate = MSG_ReadByte (); + + CL_Effect(org, modelindex, startframe, framecount, framerate); +} + +void CL_ParseEffect2 (void) +{ + vec3_t org; + int modelindex, startframe, framecount, framerate; + + MSG_ReadVector(org); + modelindex = MSG_ReadShort (); + startframe = MSG_ReadShort (); + framecount = MSG_ReadByte (); + framerate = MSG_ReadByte (); + + CL_Effect(org, modelindex, startframe, framecount, framerate); +} -extern void SHOWLMP_decodehide(); -extern void SHOWLMP_decodeshow(); -extern void R_SetSkyBox(char* sky); -extern float fog_density; -extern float fog_red; -extern float fog_green; -extern float fog_blue; +#define SHOWNET(x) if(cl_shownet.value==2)Con_Printf ("%3i:%s\n", msg_readcount-1, x); /* ===================== @@ -824,7 +897,10 @@ CL_ParseServerMessage void CL_ParseServerMessage (void) { int cmd; - int i; + int i, entitiesupdated; + byte cmdlog[32]; + char *cmdlogname[32], *temp; + int cmdindex, cmdcount = 0; // // if recording demos, copy the message out @@ -839,6 +915,9 @@ void CL_ParseServerMessage (void) // parse the message // MSG_BeginReading (); + + entitiesupdated = false; + CL_EntityUpdateSetup(); while (1) { @@ -850,24 +929,58 @@ void CL_ParseServerMessage (void) if (cmd == -1) { SHOWNET("END OF MESSAGE"); - return; // end of message + break; // end of message } - // if the high bit of the command byte is set, it is a fast update + cmdindex = cmdcount & 31; + cmdcount++; + cmdlog[cmdindex] = cmd; + + // 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"); CL_ParseUpdate (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; + } - // other commands + // other commands switch (cmd) { default: - Host_Error ("CL_ParseServerMessage: Illegible server message\n"); + { + 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) + { + sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]); + strcat(description, temp); + count--; + i++; + i &= 31; + } + description[strlen(description)-1] = '\n'; // replace the last space with a newline + Con_Printf(description); + Host_Error ("CL_ParseServerMessage: Illegible server message\n"); + } break; case svc_nop: @@ -875,6 +988,8 @@ void CL_ParseServerMessage (void) break; case svc_time: + // handle old protocols which do not have entity update ranges + entitiesupdated = true; cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = MSG_ReadFloat (); break; @@ -886,9 +1001,14 @@ void CL_ParseServerMessage (void) case svc_version: i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != 250) - Host_Error ("CL_ParseServerMessage: Server is protocol %i instead of %i\n", i, PROTOCOL_VERSION); - Nehahrademcompatibility = i == 250; + if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION && i != 250) + Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i or %i", i, DPPROTOCOL_VERSION, PROTOCOL_VERSION); + Nehahrademcompatibility = false; + if (i == 250) + Nehahrademcompatibility = true; + if (cls.demoplayback && demo_nehahra.value) + Nehahrademcompatibility = true; + dpprotocol = i == DPPROTOCOL_VERSION; break; case svc_disconnect: @@ -927,70 +1047,84 @@ void CL_ParseServerMessage (void) case svc_lightstyle: i = MSG_ReadByte (); if (i >= MAX_LIGHTSTYLES) - Host_Error ("svc_lightstyle > MAX_LIGHTSTYLES"); - strcpy (cl_lightstyle[i].map, MSG_ReadString()); + Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); + strncpy (cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING - 1); + cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0; cl_lightstyle[i].length = strlen(cl_lightstyle[i].map); break; case svc_sound: - CL_ParseStartSoundPacket(); + CL_ParseStartSoundPacket(false); break; - + + case svc_sound2: + CL_ParseStartSoundPacket(true); + break; + case svc_stopsound: i = MSG_ReadShort(); S_StopSound(i>>3, i&7); break; case svc_updatename: -// Sbar_Changed (); i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatename > MAX_SCOREBOARD"); + Host_Error ("CL_ParseServerMessage: svc_updatename >= MAX_SCOREBOARD"); strcpy (cl.scores[i].name, MSG_ReadString ()); break; case svc_updatefrags: -// Sbar_Changed (); i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatefrags > MAX_SCOREBOARD"); + Host_Error ("CL_ParseServerMessage: svc_updatefrags >= MAX_SCOREBOARD"); cl.scores[i].frags = MSG_ReadShort (); break; case svc_updatecolors: -// Sbar_Changed (); i = MSG_ReadByte (); if (i >= cl.maxclients) - Host_Error ("CL_ParseServerMessage: svc_updatecolors > MAX_SCOREBOARD"); + Host_Error ("CL_ParseServerMessage: svc_updatecolors >= MAX_SCOREBOARD"); cl.scores[i].colors = MSG_ReadByte (); - R_TranslatePlayerSkin(i); break; case svc_particle: R_ParseParticleEffect (); break; + case svc_effect: + CL_ParseEffect (); + break; + + case svc_effect2: + CL_ParseEffect2 (); + break; + case svc_spawnbaseline: i = MSG_ReadShort (); // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i)); + CL_ParseBaseline (CL_EntityNum(i), false); + break; + case svc_spawnbaseline2: + i = MSG_ReadShort (); + // must use CL_EntityNum() to force cl.num_entities up + CL_ParseBaseline (CL_EntityNum(i), true); break; case svc_spawnstatic: - CL_ParseStatic (); - break; + CL_ParseStatic (false); + break; + case svc_spawnstatic2: + CL_ParseStatic (true); + break; case svc_temp_entity: CL_ParseTEnt (); break; case svc_setpause: - { - cl.paused = MSG_ReadByte (); - - if (cl.paused) - CDAudio_Pause (); - else - CDAudio_Resume (); - } + cl.paused = MSG_ReadByte (); + if (cl.paused) + CDAudio_Pause (); + else + CDAudio_Resume (); break; case svc_signonnum: @@ -1013,11 +1147,15 @@ void CL_ParseServerMessage (void) i = MSG_ReadByte (); if (i < 0 || i >= MAX_CL_STATS) Host_Error ("svc_updatestat: %i is invalid", i); - cl.stats[i] = MSG_ReadLong ();; + cl.stats[i] = MSG_ReadLong (); break; case svc_spawnstaticsound: - CL_ParseStaticSound (); + CL_ParseStaticSound (false); + break; + + case svc_spawnstaticsound2: + CL_ParseStaticSound (true); break; case svc_cdtrack: @@ -1058,25 +1196,12 @@ void CL_ParseServerMessage (void) case svc_showlmp: SHOWLMP_decodeshow(); break; - // LordHavoc: extra worldspawn fields (fog, sky, farclip) case svc_skybox: R_SetSkyBox(MSG_ReadString()); break; - case svc_farclip: - r_farclip.value = MSG_ReadCoord(); - break; - case svc_fog: - if (MSG_ReadByte()) - { - fog_density = MSG_ReadShort() * (1.0f / 4096.0f); - fog_red = MSG_ReadByte() * (1.0 / 255.0); - fog_green = MSG_ReadByte() * (1.0 / 255.0); - fog_blue = MSG_ReadByte() * (1.0 / 255.0); - } - else - fog_density = 0.0f; - break; } } -} + if (entitiesupdated) + CL_EntityUpdateEnd(); +}