X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=8ca0b33688022bf7b946c05b70ea1d868b3cd425;hb=e537c2269e790f67f68556ded6b7cf62c55874dd;hp=4e782b6308f50e68e60f5bbdd0aea15160e93bca;hpb=9d92b5ea2e94eb7772405186dd70b2dbbdfc96bb;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 4e782b63..8ca0b336 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -29,7 +29,7 @@ char *svc_strings[128] = "svc_nop", "svc_disconnect", "svc_updatestat", - "svc_version", // [long] server version + "svc_version", // [int] server version "svc_setview", // [short] entity number "svc_sound", // "svc_time", // [float] server time @@ -38,7 +38,7 @@ char *svc_strings[128] = // the string should be \n terminated "svc_setangle", // [vec3] set the view angle to this absolute value - "svc_serverinfo", // [long] version + "svc_serverinfo", // [int] version // [string] signon string // [string]..[0]model cache [string]...[0]sounds cache // [string]..[0]item cache @@ -83,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 @@ -99,8 +99,6 @@ char *svc_strings[128] = cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; cvar_t developer_networkentities = {0, "developer_networkentities", "0"}; -mempool_t *cl_scores_mempool; - /* ================== CL_ParseStartSoundPacket @@ -144,14 +142,19 @@ void CL_ParseStartSoundPacket(int largesoundindex) 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); + 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); - - MSG_ReadVector(pos, cl.protocol); + { + Con_Printf("CL_ParseStartSoundPacket: ent = %i", ent); + return; + } S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0f, attenuation); } @@ -165,7 +168,7 @@ so the server doesn't disconnect. ================== */ -static qbyte olddata[NET_MAXMESSAGE]; +static unsigned char olddata[NET_MAXMESSAGE]; void CL_KeepaliveMessage (void) { float time; @@ -194,7 +197,7 @@ void CL_KeepaliveMessage (void) if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5) { sizebuf_t msg; - qbyte buf[4]; + unsigned char buf[4]; lastmsg = time; // write out a nop // LordHavoc: must use unreliable because reliable could kill the sigon message! @@ -204,15 +207,13 @@ void CL_KeepaliveMessage (void) msg.cursize = 0; MSG_WriteChar(&msg, svc_nop); NetConn_SendUnreliableMessage(cls.netcon, &msg); - // try not to utterly crush the computer with work, that's just rude - Sys_Sleep(1); } } void CL_ParseEntityLump(char *entdata) { const char *data; - char key[128], value[4096]; + char key[128], value[MAX_INPUTLINE]; FOG_clear(); // LordHavoc: no fog until set // LordHavoc: default to the map's sky (q3 shader parsing sets this) R_SetSkyBox(cl.worldmodel->brush.skybox); @@ -279,19 +280,29 @@ Con_DPrintf("CL_SignonReply: %i\n", cls.signon); case 2: MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("name \"%s\"\n", cl_name.string)); + MSG_WriteString (&cls.message, va("name \"%s\"", cl_name.string)); MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("color %i %i\n", cl_color.integer >> 4, cl_color.integer & 15)); + MSG_WriteString (&cls.message, va("color %i %i", cl_color.integer >> 4, cl_color.integer & 15)); if (cl_pmodel.integer) { MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer)); + MSG_WriteString (&cls.message, va("pmodel %i", cl_pmodel.integer)); + } + if (*cl_playermodel.string) + { + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("playermodel %s", cl_playermodel.string)); + } + if (*cl_playerskin.string) + { + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("playerskin %s", cl_playerskin.string)); } MSG_WriteByte (&cls.message, clc_stringcmd); - MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); + MSG_WriteString (&cls.message, va("rate %i", cl_rate.integer)); MSG_WriteByte (&cls.message, clc_stringcmd); MSG_WriteString (&cls.message, "spawn"); @@ -320,10 +331,15 @@ void CL_ParseServerInfo (void) { char *str; int i; + protocolversion_t protocol; int nummodels, numsounds; entity_t *ent; Con_DPrint("Serverinfo packet received.\n"); + + // check memory integrity + Mem_CheckSentinelsGlobal(); + // // wipe the client_state_t struct // @@ -331,26 +347,26 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - // 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_NEHAHRAMOVIE) + protocol = Protocol_EnumForNumber(i); + if (protocol == PROTOCOL_UNKNOWN) { - Host_Error("CL_ParseServerInfo: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE); + Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)", i); return; } - cl.protocol = i; - Con_DPrintf("Protocol %i\n", cl.protocol); + // hack for unmarked Nehahra movie demos which had a custom protocol + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cl.protocol = protocol; + Con_DPrintf("Server protocol is %s\n", Protocol_NameForEnum(cl.protocol)); // parse maxclients cl.maxclients = MSG_ReadByte (); if (cl.maxclients < 1 || cl.maxclients > MAX_SCOREBOARD) { - Con_Printf("Bad maxclients (%u) from server\n", cl.maxclients); + Host_Error("Bad maxclients (%u) from server", cl.maxclients); return; } - Mem_EmptyPool(cl_scores_mempool); - cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores)); + cl.scores = (scoreboard_t *)Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores)); // parse gametype cl.gametype = MSG_ReadByte (); @@ -366,6 +382,11 @@ void CL_ParseServerInfo (void) // check memory integrity Mem_CheckSentinelsGlobal(); + S_StopAllSounds(); + // if server is active, we already began a loading plaque + if (!sv.active) + SCR_BeginLoadingPlaque(); + // disable until we get textures for it R_ResetSkyBox(); @@ -379,7 +400,7 @@ void CL_ParseServerInfo (void) if (!str[0]) break; if (nummodels==MAX_MODELS) - Host_Error ("Server sent too many model precaches\n"); + Host_Error ("Server sent too many model precaches"); if (strlen(str) >= MAX_QPATH) Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels])); @@ -391,7 +412,7 @@ void CL_ParseServerInfo (void) if (!str[0]) break; if (numsounds==MAX_SOUNDS) - Host_Error("Server sent too many sound precaches\n"); + Host_Error("Server sent too many sound precaches"); if (strlen(str) >= MAX_QPATH) Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); strlcpy (parse_sound_precache[numsounds], str, sizeof (parse_sound_precache[numsounds])); @@ -401,28 +422,40 @@ void CL_ParseServerInfo (void) // anything that isn't needed Mod_ClearUsed(); for (i = 1;i < nummodels;i++) - { - CL_KeepaliveMessage(); Mod_FindName(parse_model_precache[i]); - } + // precache any models used by the client (this also marks them used) + cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false); + cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false); Mod_PurgeUnused(); // do the same for sounds + // FIXME: S_ServerSounds does not know about cl.sfx_ sounds S_ServerSounds (parse_sound_precache, numsounds); + // precache any sounds used by the client + cl.sfx_wizhit = S_PrecacheSound("sound/wizard/hit.wav", false, true); + cl.sfx_knighthit = S_PrecacheSound("sound/hknight/hit.wav", false, true); + cl.sfx_tink1 = S_PrecacheSound("sound/weapons/tink1.wav", false, true); + cl.sfx_ric1 = S_PrecacheSound("sound/weapons/ric1.wav", false, true); + cl.sfx_ric2 = S_PrecacheSound("sound/weapons/ric2.wav", false, true); + cl.sfx_ric3 = S_PrecacheSound("sound/weapons/ric3.wav", false, true); + cl.sfx_r_exp3 = S_PrecacheSound("sound/weapons/r_exp3.wav", false, true); + // now we try to load everything that is new // world model CL_KeepaliveMessage (); cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true); - if (cl.model_precache[1] == NULL) + if (cl.model_precache[1]->Draw == NULL) Con_Printf("Map %s not found\n", parse_model_precache[1]); // normal models for (i=2 ; iDraw == NULL) Con_Printf("Model %s not found\n", parse_model_precache[i]); } @@ -431,7 +464,7 @@ void CL_ParseServerInfo (void) { CL_KeepaliveMessage(); - // Don't lock the sfx here, S_ServerSounds already did that + // Don't lock the sfx here, S_ServerSounds already did that cl.sound_precache[i] = S_PrecacheSound (parse_sound_precache[i], true, false); } @@ -442,6 +475,7 @@ void CL_ParseServerInfo (void) ent->render.model = cl.worldmodel = cl.model_precache[1]; ent->render.scale = 1; // some of the renderer still relies on scale ent->render.alpha = 1; + ent->render.colormap = -1; // no special coloring ent->render.flags = RENDER_SHADOW | RENDER_LIGHT; Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, 0, 0, 0, 0, 0, 0, 1); Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix); @@ -467,7 +501,7 @@ void CL_ValidateState(entity_state_t *s) return; if (s->modelindex >= MAX_MODELS) - Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)\n", s->modelindex, MAX_MODELS); + Host_Error("CL_ValidateState: modelindex (%i) >= MAX_MODELS (%i)", s->modelindex, MAX_MODELS); // colormap is client index + 1 if ((!s->flags & RENDER_COLORMAPPED) && s->colormap > cl.maxclients) @@ -477,7 +511,6 @@ void CL_ValidateState(entity_state_t *s) } model = cl.model_precache[s->modelindex]; - Mod_CheckLoaded(model); if (model && model->type && s->frame >= model->numframes) { Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\" (which has %i frames)\n", s->frame, model->name, model->numframes); @@ -541,7 +574,7 @@ void CL_MoveLerpEntityStates(entity_t *ent) // not a monster ent->persistent.lerpstarttime = ent->state_previous.time; // no lerp if it's singleplayer - if (cl.islocalgame) + if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) ent->persistent.lerpdeltatime = 0; else ent->persistent.lerpdeltatime = bound(0, ent->state_current.time - ent->state_previous.time, 0.1); @@ -593,72 +626,73 @@ 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; + + 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]; - bits &= 0xFFFF; + if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_QUAKEDP || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5) + { + 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++) { if (bits & (SU_PUNCH1<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; - } - } + if (ent >= cl_max_entities) + CL_ExpandEntities(ent); - // find a free beam - for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + // override any beam with the same entity + i = cl_max_beams; + if (ent) + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + if (b->entity == ent) + break; + // if the entity was not found then just replace an unused beam + if (i == cl_max_beams) + for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) + if (!b->model || b->endtime < cl.time) + break; + if (i < cl_max_beams) { - if (!b->model || b->endtime < cl.time) + b->entity = ent; + b->lightning = lightning; + b->model = m; + b->endtime = cl.time + 0.2; + VectorCopy (start, b->start); + VectorCopy (end, b->end); + b->relativestartvalid = 0; + if (ent && cl_entities[ent].state_current.active) { - 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; + entity_state_t *p; + matrix4x4_t matrix, imatrix; + if (ent == cl.viewentity && cl.movement) + p = &cl_entities[b->entity].state_previous; + else + p = &cl_entities[b->entity].state_current; + // not really valid yet, we need to get the orientation now + // (ParseBeam flagged this because it is received before + // entities are received, by now they have been received) + // note: because players create lightning in their think + // function (which occurs before movement), they actually + // have some lag in it's location, so compare to the + // previous player state, not the latest + Matrix4x4_CreateFromQuakeEntity(&matrix, p->origin[0], p->origin[1], p->origin[2], -p->angles[0], p->angles[1], p->angles[2], 1); + Matrix4x4_Invert_Simple(&imatrix, &matrix); + Matrix4x4_Transform(&imatrix, b->start, b->relativestart); + Matrix4x4_Transform(&imatrix, b->end, b->relativeend); + b->relativestartvalid = 1; } } - Con_Print("beam list overflow!\n"); + else + Con_Print("beam list overflow!\n"); } void CL_ParseTempEntity(void) @@ -901,7 +915,7 @@ void CL_ParseTempEntity(void) int rnd; int colorStart, colorLength, count; float velspeed, radius; - qbyte *tempcolor; + unsigned char *tempcolor; matrix4x4_t tempmatrix; type = MSG_ReadByte(); @@ -912,9 +926,9 @@ void CL_ParseTempEntity(void) 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, 0, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + //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); + S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1); break; case TE_KNIGHTSPIKE: @@ -922,109 +936,113 @@ void CL_ParseTempEntity(void) 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, 0, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + //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); + S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1); break; case TE_SPIKE: // spike hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 10); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 15, 1); CL_Smoke(pos, vec3_origin, 15); - CL_BulletMark(pos); } + CL_BulletMark(pos); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + 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, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to spark shower - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 10); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 15, 1); CL_Smoke(pos, vec3_origin, 15); - CL_BulletMark(pos); } + 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, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + 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); + 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, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to dust shower - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 30, 1); CL_Smoke(pos, vec3_origin, 30); - CL_BulletMark(pos); } + CL_BulletMark(pos); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + 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, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - // LordHavoc: changed to dust shower - if (cl_particles_bulletimpacts.integer) + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else if (cl_particles_bulletimpacts.integer) { CL_SparkShower(pos, vec3_origin, 30, 1); CL_Smoke(pos, vec3_origin, 30); - CL_BulletMark(pos); } + 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, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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); + 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 @@ -1052,7 +1070,7 @@ void CL_ParseTempEntity(void) 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, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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 @@ -1100,8 +1118,13 @@ void CL_ParseTempEntity(void) // bullet hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else + { + CL_SparkShower(pos, vec3_origin, 15, 1); + CL_Smoke(pos, vec3_origin, 15); + } CL_BulletMark(pos); break; @@ -1109,11 +1132,16 @@ void CL_ParseTempEntity(void) // quad bullet hitting wall MSG_ReadVector(pos, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - CL_SparkShower(pos, vec3_origin, 15, 1); - CL_Smoke(pos, vec3_origin, 15); + if (cl_particles_quake.integer) + CL_RunParticleEffect(pos, vec3_origin, 0, 20); + else + { + 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, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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: @@ -1123,8 +1151,9 @@ void CL_ParseTempEntity(void) CL_ParticleExplosion(pos); // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5 Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONQUAD: @@ -1133,8 +1162,9 @@ void CL_ParseTempEntity(void) 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, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSION3: @@ -1146,8 +1176,9 @@ void CL_ParseTempEntity(void) 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, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSIONRGB: @@ -1159,8 +1190,9 @@ void CL_ParseTempEntity(void) color[1] = MSG_ReadByte() * (2.0f / 255.0f); color[2] = MSG_ReadByte() * (2.0f / 255.0f); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TAREXPLOSION: @@ -1169,29 +1201,29 @@ void CL_ParseTempEntity(void) 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); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 600, 1.6f, 0.8f, 2.0f, 1200, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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, 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, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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, cl.protocol); CL_FindNonSolidLocation(pos, pos, 4); - radius = MSG_ReadByte() * 8; + radius = (MSG_ReadByte() + 1) * 8; velspeed = (MSG_ReadByte() + 1) * (1.0 / 256.0); color[0] = MSG_ReadByte() * (2.0f / 255.0f); color[1] = MSG_ReadByte() * (2.0f / 255.0f); color[2] = MSG_ReadByte() * (2.0f / 255.0f); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, radius, color[0], color[1], color[2], radius / velspeed, velspeed, 0, 0, true, 1, 0.25, 1, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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: @@ -1203,31 +1235,23 @@ void CL_ParseTempEntity(void) case TE_LIGHTNING1: // lightning bolts - if (!cl_model_bolt) - cl_model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); - CL_ParseBeam(cl_model_bolt, true); + CL_ParseBeam(cl.model_bolt, true); break; case TE_LIGHTNING2: // lightning bolts - if (!cl_model_bolt2) - cl_model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); - CL_ParseBeam(cl_model_bolt2, true); + 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); + 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); + CL_ParseBeam(cl.model_beam, false); break; // PGM 01/21/97 @@ -1244,8 +1268,8 @@ void CL_ParseTempEntity(void) case TE_TELEPORT: MSG_ReadVector(pos, cl.protocol); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 500, 1.0f, 1.0f, 1.0f, 1500, 99.0f, 0, 0, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); -// CL_TeleportSplash(pos); + 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: @@ -1255,21 +1279,21 @@ void CL_ParseTempEntity(void) colorStart = MSG_ReadByte(); colorLength = MSG_ReadByte(); CL_ParticleExplosion2(pos, colorStart, colorLength); - tempcolor = (qbyte *)&palette_complete[(rand()%colorLength) + colorStart]; + tempcolor = (unsigned char *)&palette_complete[(rand()%colorLength) + colorStart]; color[0] = tempcolor[0] * (2.0f / 255.0f); color[1] = tempcolor[1] * (2.0f / 255.0f); color[2] = tempcolor[2] * (2.0f / 255.0f); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); - CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TEI_G3: MSG_ReadVector(pos, cl.protocol); MSG_ReadVector(pos2, cl.protocol); MSG_ReadVector(dir, cl.protocol); - CL_BeamParticle(pos, pos2, 12, 1, 0.3, 0.1, 1, 1); - CL_BeamParticle(pos, pos2, 5, 1, 0.9, 0.3, 1, 1); + CL_BeamParticle(pos, pos2, 8, 1, 1, 1, 1, 1); break; case TE_TEI_SMOKE: @@ -1285,8 +1309,9 @@ void CL_ParseTempEntity(void) 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, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TEI_PLASMAHIT: @@ -1296,7 +1321,7 @@ void CL_ParseTempEntity(void) 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, 0, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); + 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: @@ -1306,7 +1331,7 @@ void CL_ParseTempEntity(void) #define SHOWNET(x) if(cl_shownet.integer==2)Con_Printf("%3i:%s\n", msg_readcount-1, x); -static qbyte cgamenetbuffer[65536]; +static unsigned char cgamenetbuffer[65536]; /* ===================== @@ -1318,9 +1343,11 @@ void CL_ParseServerMessage(void) { int cmd; int i; - qbyte cmdlog[32]; + protocolversion_t protocol; + unsigned char cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; + qboolean sendmove = false; if (cls.demorecording) CL_WriteDemoMessage (); @@ -1401,7 +1428,7 @@ void CL_ParseServerMessage(void) i &= 31; while(count > 0) { - snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); + dpsnprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); strlcat (description, temp, sizeof (description)); count--; i++; @@ -1409,7 +1436,7 @@ void CL_ParseServerMessage(void) } description[strlen(description)-1] = '\n'; // replace the last space with a newline Con_Print(description); - Host_Error ("CL_ParseServerMessage: Illegible server message\n"); + Host_Error ("CL_ParseServerMessage: Illegible server message"); } break; @@ -1421,21 +1448,22 @@ void CL_ParseServerMessage(void) case svc_time: cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = MSG_ReadFloat (); + sendmove = true; break; case svc_clientdata: - i = (unsigned short) MSG_ReadShort (); - CL_ParseClientdata (i); + CL_ParseClientdata(); break; case svc_version: i = MSG_ReadLong (); + protocol = Protocol_EnumForNumber(i); + if (protocol == PROTOCOL_UNKNOWN) + Host_Error("CL_ParseServerMessage: Server is unrecognized protocol number (%i)", i); // hack for unmarked Nehahra movie demos which had a custom protocol - if (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_NEHAHRAMOVIE) - Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_NEHAHRAMOVIE); - cl.protocol = i; + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cl.protocol = protocol; break; case svc_disconnect: @@ -1474,7 +1502,9 @@ void CL_ParseServerMessage(void) case svc_setview: cl.viewentity = (unsigned short)MSG_ReadShort (); if (cl.viewentity >= MAX_EDICTS) - Host_Error("svc_setview >= MAX_EDICTS\n"); + Host_Error("svc_setview >= MAX_EDICTS"); + if (cl.viewentity >= cl_max_entities) + CL_ExpandEntities(cl.viewentity); // LordHavoc: assume first setview recieved is the real player entity if (!cl.playerentity) cl.playerentity = cl.viewentity; @@ -1486,15 +1516,49 @@ void CL_ParseServerMessage(void) Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); strlcpy (cl_lightstyle[i].map, MSG_ReadString(), sizeof (cl_lightstyle[i].map)); cl_lightstyle[i].map[MAX_STYLESTRING - 1] = 0; - cl_lightstyle[i].length = strlen(cl_lightstyle[i].map); + cl_lightstyle[i].length = (int)strlen(cl_lightstyle[i].map); break; case svc_sound: 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: @@ -1539,12 +1603,16 @@ void CL_ParseServerMessage(void) i = (unsigned short) MSG_ReadShort (); if (i < 0 || i >= MAX_EDICTS) Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i); + if (i >= cl_max_entities) + CL_ExpandEntities(i); CL_ParseBaseline (cl_entities + i, false); break; case svc_spawnbaseline2: i = (unsigned short) MSG_ReadShort (); if (i < 0 || i >= MAX_EDICTS) Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i); + if (i >= cl_max_entities) + CL_ExpandEntities(i); CL_ParseBaseline (cl_entities + i, true); break; case svc_spawnstatic: @@ -1568,7 +1636,9 @@ void CL_ParseServerMessage(void) 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 (); @@ -1589,6 +1659,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; @@ -1601,9 +1678,9 @@ void CL_ParseServerMessage(void) cl.cdtrack = MSG_ReadByte (); cl.looptrack = MSG_ReadByte (); if ( (cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1) ) - CDAudio_Play ((qbyte)cls.forcetrack, true); + CDAudio_Play ((unsigned char)cls.forcetrack, true); else - CDAudio_Play ((qbyte)cl.cdtrack, true); + CDAudio_Play ((unsigned char)cl.cdtrack, true); break; case svc_intermission: @@ -1681,16 +1758,20 @@ void CL_ParseServerMessage(void) EntityFrame_CL_ReadFrame(); else if (cl.protocol == PROTOCOL_DARKPLACES4) EntityFrame4_CL_ReadFrame(); - else if (cl.protocol == PROTOCOL_DARKPLACES5) - EntityFrame5_CL_ReadFrame(); else - Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol); + EntityFrame5_CL_ReadFrame(); break; } } EntityFrameQuake_ISeeDeadEntities(); + if (sendmove) + { + // send one move per server frame + CL_SendMove(); + } + parsingerror = false; } @@ -1706,9 +1787,12 @@ void CL_Parse_DumpPacket(void) void CL_Parse_Init(void) { // LordHavoc: added demo_nehahra cvar - cl_scores_mempool = Mem_AllocPool("client player info", 0, NULL); Cvar_RegisterVariable (&demo_nehahra); if (gamemode == GAME_NEHAHRA) Cvar_SetValue("demo_nehahra", 1); Cvar_RegisterVariable(&developer_networkentities); } + +void CL_Parse_Shutdown(void) +{ +}