X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=9f11a47d0055081e55fbe9bd787780f0566442c8;hb=038ff8d79bb5044145cc2f87a8df1ce732209e4d;hp=6bbe93388e03889ba82abce6f7401d05ab09375a;hpb=f5822de9dd7f185161528e3830692ae75bbeef67;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 6bbe9338..9f11a47d 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -96,33 +96,9 @@ char *svc_strings[128] = cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; -void CL_Parse_Init(void) -{ - // LordHavoc: added demo_nehahra cvar - Cvar_RegisterVariable (&demo_nehahra); - if (gamemode == GAME_NEHAHRA) - Cvar_SetValue("demo_nehahra", 1); -} - qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces -/* -=============== -CL_EntityNum - -This error checks and tracks the total number of entities -=============== -*/ -entity_t *CL_EntityNum (int num) -{ - if (num >= MAX_EDICTS) - Host_Error ("CL_EntityNum: %i is an invalid number",num); - - return &cl_entities[num]; -} - - /* ================== CL_ParseStartSoundPacket @@ -130,28 +106,39 @@ 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; + int i; + + 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 (); @@ -159,16 +146,14 @@ void CL_ParseStartSoundPacket(int largesoundindex) 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; - if (ent > MAX_EDICTS) + if (ent >= MAX_EDICTS) Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent); - - for (i=0 ; i<3 ; i++) + + for (i = 0;i < 3;i++) pos[i] = MSG_ReadCoord (); - 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.0, attenuation); } /* @@ -187,7 +172,7 @@ void CL_KeepaliveMessage (void) int c; sizebuf_t old; qbyte olddata[8192]; - + if (sv.active) return; // no need if server is local if (cls.demoplayback) @@ -196,7 +181,7 @@ void CL_KeepaliveMessage (void) // read messages from server, should just be nops old = net_message; memcpy (olddata, net_message.data, net_message.cursize); - + do { ret = CL_GetMessage (); @@ -236,22 +221,20 @@ void CL_KeepaliveMessage (void) void CL_ParseEntityLump(char *entdata) { - char *data; + const char *data; char key[128], value[4096]; FOG_clear(); // LordHavoc: no fog until set R_SetSkyBox(""); // LordHavoc: no environment mapped sky until set data = entdata; if (!data) return; - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data)) return; // error if (com_token[0] != '{') return; // error while (1) { - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data)) return; // error if (com_token[0] == '}') break; // end of worldspawn @@ -261,8 +244,7 @@ void CL_ParseEntityLump(char *entdata) strcpy(key, com_token); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - data = COM_Parse(data); - if (!data) + if (!COM_ParseToken(&data)) return; // error strcpy(value, com_token); if (!strcmp("sky", key)) @@ -318,8 +300,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); } MSG_WriteByte (&cls.message, clc_stringcmd); - //sprintf (str, "spawn %s", cls.spawnparms); - //MSG_WriteString (&cls.message, str); MSG_WriteString (&cls.message, "spawn"); break; @@ -340,13 +320,14 @@ 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"); @@ -359,7 +340,7 @@ void CL_ParseServerInfo (void) i = MSG_ReadLong (); if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) { - Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); + Host_Error ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); return; } Nehahrademcompatibility = false; @@ -394,100 +375,99 @@ void CL_ParseServerInfo (void) 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 -// - + // check memory integrity Mem_CheckSentinelsGlobal(); - Mod_ClearUsed(); + // disable until we get textures for it + R_ResetSkyBox(); -// precache models memset (cl.model_precache, 0, sizeof(cl.model_precache)); + memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + + // touch all of the precached models that are still loaded so we can free + // anything that isn't needed + Mod_ClearUsed(); for (nummodels=1 ; ; nummodels++) { + CL_KeepaliveMessage (); 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); + strcpy (parse_model_precache[nummodels], str); Mod_TouchModel (str); } -// precache sounds - memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + // do the same for sounds for (numsounds=1 ; ; numsounds++) { + CL_KeepaliveMessage (); str = MSG_ReadString (); if (!str[0]) break; if (numsounds==MAX_SOUNDS) - { Host_Error ("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); + strcpy (parse_sound_precache[numsounds], str); S_TouchSound (str); } + // purge anything that was not touched Mod_PurgeUnused(); -// -// now we try to load everything else until a cache allocation fails -// + // 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; ent->render.alpha = 1; - VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins); - VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs); + ent->render.flags = RENDER_SHADOW; + 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(); - Mem_CheckSentinelsGlobal(); + // noclip is turned off at start + noclip_anglehack = false; - noclip_anglehack = false; // noclip is turned off at start + // check memory integrity + Mem_CheckSentinelsGlobal(); } void CL_ValidateState(entity_state_t *s) @@ -518,6 +498,50 @@ void CL_ValidateState(entity_state_t *s) } } +void CL_MoveLerpEntityStates(entity_t *ent) +{ + float odelta[3], adelta[3]; + 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) + { + // we definitely shouldn't lerp + 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) + { + 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); + VectorCopy(ent->state_current.origin, ent->persistent.neworigin); + VectorCopy(ent->state_current.angles, ent->persistent.newangles); + } + } + else + { + // not a monster + ent->persistent.lerpstarttime = cl.mtime[1]; + // 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]; + 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 @@ -527,10 +551,9 @@ If an entities model or origin changes from frame to frame, it must be relinked. Other attributes can change without relinking. ================== */ -int bitprofile[32], bitprofilecount = 0; void CL_ParseUpdate (int bits) { - int i, num; + int num; entity_t *ent; entity_state_t new; @@ -553,15 +576,7 @@ void CL_ParseUpdate (int bits) if (num < 1) Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num); - // mark as visible (no kill this frame) - entlife[num] = 2; - - ent = CL_EntityNum (num); - - for (i = 0;i < 32;i++) - if (bits & (1 << i)) - bitprofile[i]++; - bitprofilecount++; + 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 @@ -569,10 +584,13 @@ void CL_ParseUpdate (int bits) 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(); @@ -622,96 +640,35 @@ void CL_ParseUpdate (int bits) if (new.active) CL_ValidateState(&new); - if (new.flags & RENDER_STEP) // FIXME: rename this flag? - { - // make time identical for memcmp - new.time = ent->state_current.time; - if (memcmp(&new, &ent->state_current, sizeof(entity_state_t))) - { - // set it back to what it should be - new.time = cl.mtime[0] + 0.1; - // state has changed - ent->state_previous = ent->state_current; - ent->state_current = new; - // assume 10fps animation - //ent->state_previous.time = cl.mtime[0] - 0.1; - } - } - else + ent->state_previous = ent->state_current; + ent->state_current = new; + if (ent->state_current.active) { - ent->state_previous = ent->state_current; - ent->state_current = new; + CL_MoveLerpEntityStates(ent); + cl_entities_active[ent->state_current.number] = true; + // mark as visible (no kill this frame) + entlife[ent->state_current.number] = 2; } } +static entity_frame_t entityframe; 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++) { - // the entity lives again... - entlife[entityframe.entitydata[i].number] = 2; // copy the states ent = &cl_entities[entityframe.entitydata[i].number]; ent->state_previous = ent->state_current; ent->state_current = entityframe.entitydata[i]; - ent->state_current.time = cl.mtime[0]; + 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); -} - -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", - "obsolete 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++) - 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) @@ -890,29 +847,14 @@ void CL_ParseStatic (int large) ent->render.skinnum = ent->state_baseline.skin; ent->render.effects = ent->state_baseline.effects; ent->render.alpha = 1; - ent->render.scale = 1; - 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); - if (ent->render.angles[0] || ent->render.angles[2]) - { - // pitch or roll - VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins); - VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs); - } - else if (ent->render.angles[1]) - { - // yaw - VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins); - VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs); - } - else - { - VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins); - VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs); - } + Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1); + Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); + CL_BoundingBoxForEntity(&ent->render); // This is definitely cheating... if (ent->render.model == NULL) @@ -968,6 +910,461 @@ void CL_ParseEffect2 (void) CL_Effect(org, modelindex, startframe, framecount, framerate); } +model_t *cl_model_bolt = NULL; +model_t *cl_model_bolt2 = NULL; +model_t *cl_model_bolt3 = NULL; +model_t *cl_model_beam = NULL; + +sfx_t *cl_sfx_wizhit; +sfx_t *cl_sfx_knighthit; +sfx_t *cl_sfx_tink1; +sfx_t *cl_sfx_ric1; +sfx_t *cl_sfx_ric2; +sfx_t *cl_sfx_ric3; +sfx_t *cl_sfx_r_exp3; + +/* +================= +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); +} + +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); + + if (ent >= MAX_EDICTS) + { + Con_Printf("CL_ParseBeam: invalid entity number %i\n", ent); + ent = 0; + } + + // override any beam with the same entity + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + { + 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); + VectorCopy (end, b->end); + return; + } + } + + // find a free beam + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + { + if (!b->model || b->endtime < cl.time) + { + b->entity = ent; + b->lightning = lightning; + b->relativestartvalid = (ent && cl_entities[ent].state_current.active) ? 2 : 0; + b->model = m; + b->endtime = cl.time + 0.2; + VectorCopy (start, b->start); + VectorCopy (end, b->end); + return; + } + } + Con_Printf ("beam list overflow!\n"); +} + +void CL_ParseTempEntity (void) +{ + int type; + vec3_t pos; + vec3_t dir; + vec3_t pos2; + vec3_t color; + int rnd; + int colorStart, colorLength, count; + float velspeed, radius; + qbyte *tempcolor; + + type = MSG_ReadByte (); + switch (type) + { + case TE_WIZSPIKE: + // spike hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_AllocDlight (NULL, pos, 50, 0.25f, 1.00f, 0.25f, 250, 0.2); + 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, pos, cl.worldmodel, 4); + CL_AllocDlight (NULL, pos, 50, 1.0f, 0.60f, 0.20f, 250, 0.2); + 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, pos, cl.worldmodel, 4); + // LordHavoc: changed to spark shower + CL_SparkShower(pos, vec3_origin, 15); + if ( rand() % 5 ) + S_StartSound (-1, 0, cl_sfx_tink1, pos, 1, 1); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + case TE_SPIKEQUAD: + // quad spike hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 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); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + case TE_SUPERSPIKE: + // super spike hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 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); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + case TE_SUPERSPIKEQUAD: + // quad super spike hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 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); + else + { + rnd = rand() & 3; + if (rnd == 1) + S_StartSound (-1, 0, cl_sfx_ric1, pos, 1, 1); + else if (rnd == 2) + S_StartSound (-1, 0, cl_sfx_ric2, pos, 1, 1); + else + S_StartSound (-1, 0, cl_sfx_ric3, pos, 1, 1); + } + break; + // LordHavoc: added for improved blood splatters + case TE_BLOOD: + // blood puff + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 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); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_BloodPuff(pos, vec3_origin, 10); + break; + case TE_SPARK: + // spark shower + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + dir[0] = MSG_ReadChar (); + dir[1] = MSG_ReadChar (); + dir[2] = MSG_ReadChar (); + count = MSG_ReadByte (); + CL_SparkShower(pos, dir, count); + break; + case TE_PLASMABURN: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + 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 + 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 + 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 + 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 + CL_ParticleRain(pos, pos2, dir, count, colorStart, 1); + break; + + case TE_GUNSHOT: + // bullet hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + // LordHavoc: changed to dust shower + CL_SparkShower(pos, vec3_origin, 15); + break; + + case TE_GUNSHOTQUAD: + // quad bullet hitting wall + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_SparkShower(pos, vec3_origin, 15); + CL_AllocDlight (NULL, pos, 200, 0.1f, 0.1f, 1.0f, 1000, 0.2); + break; + + case TE_EXPLOSION: + // rocket explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 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); + break; + + case TE_EXPLOSIONQUAD: + // quad rocket explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + 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); + break; + + case TE_EXPLOSION3: + // Nehahra movie colored lighting explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + 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); + break; + + case TE_EXPLOSIONRGB: + // colored lighting explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + 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); + break; + + case TE_TAREXPLOSION: + // tarbaby explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + 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); + break; + + case TE_SMALLFLASH: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_AllocDlight (NULL, pos, 200, 1, 1, 1, 1000, 0.2); + break; + + case TE_CUSTOMFLASH: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + radius = MSG_ReadByte() * 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); + break; + + case TE_FLAMEJET: + MSG_ReadVector(pos); + MSG_ReadVector(dir); + count = MSG_ReadByte(); + CL_Flames(pos, dir, count); + break; + + 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, 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, 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, false); + break; + +// PGM 01/21/97 + case TE_BEAM: + // grappling hook beam + if (!cl_model_beam) + cl_model_beam = Mod_ForName("progs/beam.mdl", true, false, false); + 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), false); + break; + + case TE_LAVASPLASH: + pos[0] = MSG_ReadCoord (); + pos[1] = MSG_ReadCoord (); + pos[2] = MSG_ReadCoord (); + CL_LavaSplash (pos); + break; + + case TE_TELEPORT: + pos[0] = MSG_ReadCoord (); + pos[1] = MSG_ReadCoord (); + pos[2] = MSG_ReadCoord (); + CL_AllocDlight (NULL, pos, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f); +// CL_TeleportSplash (pos); + break; + + case TE_EXPLOSION2: + // color mapped explosion + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + colorStart = MSG_ReadByte (); + colorLength = MSG_ReadByte (); + CL_ParticleExplosion2 (pos, colorStart, colorLength); + tempcolor = (qbyte *)&palette_complete[(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); + break; + + case TE_TEI_G3: + MSG_ReadVector(pos); + MSG_ReadVector(pos2); + MSG_ReadVector(dir); + CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1); + CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1); + break; + + case TE_TEI_SMOKE: + MSG_ReadVector(pos); + MSG_ReadVector(dir); + count = MSG_ReadByte (); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 4); + CL_Tei_Smoke(pos, dir, count); + break; + + case TE_TEI_BIGEXPLOSION: + MSG_ReadVector(pos); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 10); + CL_ParticleExplosion (pos); + CL_AllocDlight (NULL, pos, 500, 1.25f, 1.0f, 0.5f, 500, 9999); + S_StartSound (-1, 0, cl_sfx_r_exp3, pos, 1, 1); + break; + + case TE_TEI_PLASMAHIT: + MSG_ReadVector(pos); + MSG_ReadVector(dir); + count = MSG_ReadByte (); + Mod_FindNonSolidLocation(pos, pos, cl.worldmodel, 5); + CL_Tei_PlasmaHit(pos, dir, count); + CL_AllocDlight (NULL, pos, 500, 0.3, 0.6, 1.0f, 2000, 9999); + break; + + default: + 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); @@ -978,6 +1375,7 @@ static qbyte cgamenetbuffer[65536]; CL_ParseServerMessage ===================== */ +int parsingerror = false; void CL_ParseServerMessage (void) { int cmd; @@ -1002,6 +1400,8 @@ void CL_ParseServerMessage (void) entitiesupdated = false; + parsingerror = true; + while (1) { if (msg_badread) @@ -1198,13 +1598,15 @@ void CL_ParseServerMessage (void) case svc_spawnbaseline: i = MSG_ReadShort (); - // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i), false); + if (i < 0 || i >= MAX_EDICTS) + Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i); + CL_ParseBaseline (cl_entities + 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); + if (i < 0 || i >= MAX_EDICTS) + Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i); + CL_ParseBaseline (cl_entities + i, true); break; case svc_spawnstatic: CL_ParseStatic (false); @@ -1213,7 +1615,7 @@ void CL_ParseServerMessage (void) CL_ParseStatic (true); break; case svc_temp_entity: - CL_ParseTEnt (); + CL_ParseTempEntity (); break; case svc_setpause: @@ -1317,5 +1719,23 @@ void CL_ParseServerMessage (void) if (entitiesupdated) CL_EntityUpdateEnd(); + + parsingerror = false; } +void CL_Parse_DumpPacket(void) +{ + if (!parsingerror) + return; + Con_Printf("Packet dump:\n"); + SZ_HexDumpToConsole(&net_message); + parsingerror = false; +} + +void CL_Parse_Init(void) +{ + // LordHavoc: added demo_nehahra cvar + Cvar_RegisterVariable (&demo_nehahra); + if (gamemode == GAME_NEHAHRA) + Cvar_SetValue("demo_nehahra", 1); +}