X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_parse.c;h=5580300fd8821df1a891b5b460822bba7a025168;hp=a0af3961b7df3a68e694e72cc9cd3eb1c3a277c7;hb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;hpb=644a9a5c132c974f1eba782d102f1a16fd16c403 diff --git a/cl_parse.c b/cl_parse.c index a0af3961..5580300f 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 @@ -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); } @@ -277,29 +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\n", cl_playermodel.string)); + 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\n", cl_playerskin.string)); + 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"); @@ -328,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 // @@ -339,16 +347,17 @@ 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_DARKPLACES6 && 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), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE); + Host_Error("CL_ParseServerInfo: Server is unrecognized protocol number (%i)\n", i); return; } - cl.protocol = i; - Con_DPrintf("Server protocol is %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 (); @@ -357,8 +366,7 @@ void CL_ParseServerInfo (void) Host_Error("Bad maxclients (%u) from server\n", 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 (); @@ -415,11 +423,26 @@ void CL_ParseServerInfo (void) Mod_ClearUsed(); for (i = 1;i < nummodels;i++) Mod_FindName(parse_model_precache[i]); + // precache any models used by the client (this also marks them used) + cl.model_bolt = Mod_ForName("progs/bolt.mdl", false, false, false); + cl.model_bolt2 = Mod_ForName("progs/bolt2.mdl", false, false, false); + cl.model_bolt3 = Mod_ForName("progs/bolt3.mdl", false, false, false); + cl.model_beam = Mod_ForName("progs/beam.mdl", false, false, false); Mod_PurgeUnused(); // do the same for sounds + // FIXME: S_ServerSounds does not know about cl.sfx_ sounds S_ServerSounds (parse_sound_precache, numsounds); + // precache any sounds used by the client + cl.sfx_wizhit = S_PrecacheSound("sound/wizard/hit.wav", false, true); + cl.sfx_knighthit = S_PrecacheSound("sound/hknight/hit.wav", false, true); + cl.sfx_tink1 = S_PrecacheSound("sound/weapons/tink1.wav", false, true); + cl.sfx_ric1 = S_PrecacheSound("sound/weapons/ric1.wav", false, true); + cl.sfx_ric2 = S_PrecacheSound("sound/weapons/ric2.wav", false, true); + cl.sfx_ric3 = S_PrecacheSound("sound/weapons/ric3.wav", false, true); + cl.sfx_r_exp3 = S_PrecacheSound("sound/weapons/r_exp3.wav", false, true); + // now we try to load everything that is new // world model @@ -441,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); } @@ -452,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); @@ -603,30 +627,34 @@ 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]; - if (cl.protocol != PROTOCOL_DARKPLACES6) + 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.punchangle[0] = 0; - cl.punchangle[1] = 0; - cl.punchangle[2] = 0; - cl.punchvector[0] = 0; - cl.punchvector[1] = 0; - cl.punchvector[2] = 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 &= 0xFFFF; + bits = (unsigned short) MSG_ReadShort (); if (bits & SU_EXTEND1) bits |= (MSG_ReadByte() << 16); if (bits & SU_EXTEND2) @@ -642,43 +670,35 @@ void CL_ParseClientdata (int bits) { if (bits & (SU_PUNCH1<= cl_max_entities) + CL_ExpandEntities(ent); + // override any beam with the same entity for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) { - if (b->entity == ent) + if (b->entity == ent && ent) { //b->entity = ent; b->lightning = lightning; @@ -924,7 +917,7 @@ void CL_ParseTempEntity(void) Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.12f, 0.50f, 0.12f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); CL_RunParticleEffect(pos, vec3_origin, 20, 30); - S_StartSound(-1, 0, cl_sfx_wizhit, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_wizhit, pos, 1, 1); break; case TE_KNIGHTSPIKE: @@ -934,7 +927,7 @@ void CL_ParseTempEntity(void) Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.50f, 0.30f, 0.10f, 500, 0.2, 0, -1, false, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); CL_RunParticleEffect(pos, vec3_origin, 226, 20); - S_StartSound(-1, 0, cl_sfx_knighthit, pos, 1, 1); + S_StartSound(-1, 0, cl.sfx_knighthit, pos, 1, 1); break; case TE_SPIKE: @@ -948,16 +941,16 @@ void CL_ParseTempEntity(void) 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: @@ -973,18 +966,17 @@ void CL_ParseTempEntity(void) } Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + 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: @@ -999,16 +991,16 @@ void CL_ParseTempEntity(void) 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: @@ -1025,16 +1017,16 @@ void CL_ParseTempEntity(void) Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 100, 0.15f, 0.15f, 1.5f, 500, 0.2, 0, -1, true, 1, 0.25, 1, 0, 0, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); if (rand() % 5) - S_StartSound(-1, 0, cl_sfx_tink1, pos, 1, 1); + 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 @@ -1134,7 +1126,8 @@ void CL_ParseTempEntity(void) // LordHavoc: boosted color from 1.0, 0.8, 0.4 to 1.25, 1.0, 0.5 Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 350, 4.0f, 2.0f, 0.50f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - 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); break; case TE_EXPLOSIONQUAD: @@ -1144,7 +1137,8 @@ void CL_ParseTempEntity(void) CL_ParticleExplosion(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 350, 2.5f, 2.0f, 4.0f, 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_EXPLOSION3: @@ -1156,8 +1150,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, -1, 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: @@ -1170,7 +1165,8 @@ void CL_ParseTempEntity(void) color[2] = MSG_ReadByte() * (2.0f / 255.0f); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TAREXPLOSION: @@ -1179,8 +1175,8 @@ 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, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); break; @@ -1195,7 +1191,7 @@ void CL_ParseTempEntity(void) 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); @@ -1213,31 +1209,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 @@ -1254,8 +1242,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, -1, 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: @@ -1271,7 +1259,8 @@ void CL_ParseTempEntity(void) color[2] = tempcolor[2] * (2.0f / 255.0f); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 350, color[0], color[1], color[2], 700, 0.5, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TEI_G3: @@ -1295,7 +1284,8 @@ void CL_ParseTempEntity(void) CL_ParticleExplosion(pos); Matrix4x4_CreateTranslate(&tempmatrix, pos[0], pos[1], pos[2]); CL_AllocDlight(NULL, &tempmatrix, 500, 2.5f, 2.0f, 1.0f, 500, 9999, 0, -1, true, 1, 0.25, 0.25, 1, 1, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE); - S_StartSound(-1, 0, cl_sfx_r_exp3, pos, 1, 1); + if (gamemode != GAME_NEXUIZ) + S_StartSound(-1, 0, cl.sfx_r_exp3, pos, 1, 1); break; case TE_TEI_PLASMAHIT: @@ -1327,9 +1317,11 @@ void CL_ParseServerMessage(void) { int cmd; int i; + protocolversion_t protocol; qbyte cmdlog[32]; char *cmdlogname[32], *temp; int cmdindex, cmdcount = 0; + qboolean sendmove = false; if (cls.demorecording) CL_WriteDemoMessage (); @@ -1410,7 +1402,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++; @@ -1430,21 +1422,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)\n", 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_DARKPLACES6 && i != PROTOCOL_NEHAHRAMOVIE) - Host_Error("CL_ParseServerMessage: Server is protocol %i, not %i (Quake), %i (DP1), %i (DP2), %i (DP3), %i (DP4), %i (DP5), %i (DP6), or %i (Nehahra movie)", i, PROTOCOL_QUAKE, PROTOCOL_DARKPLACES1, PROTOCOL_DARKPLACES2, PROTOCOL_DARKPLACES3, PROTOCOL_DARKPLACES4, PROTOCOL_DARKPLACES5, PROTOCOL_DARKPLACES6, PROTOCOL_NEHAHRAMOVIE); - cl.protocol = i; + if (protocol == PROTOCOL_QUAKEDP && cls.demoplayback && demo_nehahra.integer) + protocol = PROTOCOL_NEHAHRAMOVIE; + cl.protocol = protocol; break; case svc_disconnect: @@ -1484,6 +1477,8 @@ void CL_ParseServerMessage(void) cl.viewentity = (unsigned short)MSG_ReadShort (); if (cl.viewentity >= MAX_EDICTS) Host_Error("svc_setview >= MAX_EDICTS\n"); + if (cl.viewentity >= cl_max_entities) + CL_ExpandEntities(cl.viewentity); // LordHavoc: assume first setview recieved is the real player entity if (!cl.playerentity) cl.playerentity = cl.viewentity; @@ -1495,7 +1490,7 @@ 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: @@ -1582,12 +1577,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: @@ -1733,16 +1732,20 @@ void CL_ParseServerMessage(void) EntityFrame_CL_ReadFrame(); else if (cl.protocol == PROTOCOL_DARKPLACES4) EntityFrame4_CL_ReadFrame(); - else if (cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6) - EntityFrame5_CL_ReadFrame(); else - Host_Error("CL_ParseServerMessage: svc_entities: unknown cl.protocol %i\n", cl.protocol); + EntityFrame5_CL_ReadFrame(); break; } } EntityFrameQuake_ISeeDeadEntities(); + if (sendmove) + { + // send one move per server frame + CL_SendMove(); + } + parsingerror = false; } @@ -1758,7 +1761,6 @@ 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); @@ -1767,5 +1769,4 @@ void CL_Parse_Init(void) void CL_Parse_Shutdown(void) { - Mem_FreePool (&cl_scores_mempool); }