X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=dd7f700b56d6a3e72c6f35b02bc654a06681b23f;hb=7d9b2407c16f91d50b4b05e6dbbabc8d60d996b5;hp=0e67fe36c2b245d8d4f55415413dcbb8f0d2d56c;hpb=71c88e4a876a4cfcccf312e3cd4ddbb1ced6d11f;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 0e67fe36..dd7f700b 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -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); } @@ -287,6 +290,16 @@ Con_DPrintf("CL_SignonReply: %i\n", cls.signon); MSG_WriteByte (&cls.message, clc_stringcmd); MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer)); } + if (*cl_playermodel.string) + { + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("playermodel %s\n", cl_playermodel.string)); + } + if (*cl_playerskin.string) + { + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("playerskin %s\n", cl_playerskin.string)); + } MSG_WriteByte (&cls.message, clc_stringcmd); MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); @@ -318,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 // @@ -329,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_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("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\n", cl.maxclients); return; } - Mem_EmptyPool(cl_scores_mempool); - cl.scores = Mem_Alloc(cl_scores_mempool, cl.maxclients*sizeof(*cl.scores)); + cl.scores = Mem_Alloc(cl_mempool, cl.maxclients*sizeof(*cl.scores)); // parse gametype cl.gametype = MSG_ReadByte (); @@ -364,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(); @@ -426,7 +449,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); } @@ -588,30 +611,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) @@ -627,43 +654,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++) { @@ -958,7 +980,6 @@ 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); else @@ -1119,7 +1140,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: @@ -1129,7 +1151,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: @@ -1141,8 +1164,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: @@ -1155,7 +1179,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: @@ -1164,8 +1189,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; @@ -1180,7 +1205,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); @@ -1239,8 +1264,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: @@ -1256,15 +1281,15 @@ 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: 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: @@ -1281,7 +1306,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: @@ -1313,9 +1339,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 (); @@ -1396,7 +1424,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++; @@ -1416,21 +1444,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: @@ -1470,6 +1499,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; @@ -1516,8 +1547,7 @@ void CL_ParseServerMessage(void) if (i >= 1 && i < MAX_SOUNDS) { sfx_t *sfx = S_PrecacheSound (s, true, false); - // FIXME: SFXFLAG_SERVEROSUND should be set on the sfx - if (!sfx) + if (!sfx && snd_initialized.integer) Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s); cl.sound_precache[i] = sfx; } @@ -1569,12 +1599,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: @@ -1598,7 +1632,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 (); @@ -1718,16 +1754,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; } @@ -1743,9 +1783,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) +{ +}