X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=411fd02c47c7ea089e4ca3f3efbfe6db8f65ca08;hb=bdbd009f72846eafb32d1efe43c521c22ca65fda;hp=9f11a47d0055081e55fbe9bd787780f0566442c8;hpb=6b6b622f054e260ca0644fa96647892e997d492c;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index 9f11a47d..411fd02c 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // cl_parse.c -- parse a message received from the server #include "quakedef.h" +#include "cl_collision.h" char *svc_strings[128] = { @@ -95,9 +96,9 @@ char *svc_strings[128] = //============================================================================= cvar_t demo_nehahra = {0, "demo_nehahra", "0"}; +cvar_t developer_networkentities = {0, "developer_networkentities", "0"}; -qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments -int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces +mempool_t *cl_scores_mempool; /* ================== @@ -112,7 +113,6 @@ void CL_ParseStartSoundPacket(int largesoundindex) int volume; int field_mask; float attenuation; - int i; field_mask = MSG_ReadByte(); @@ -150,8 +150,7 @@ void CL_ParseStartSoundPacket(int largesoundindex) if (ent >= MAX_EDICTS) Host_Error ("CL_ParseStartSoundPacket: ent = %i", ent); - for (i = 0;i < 3;i++) - pos[i] = MSG_ReadCoord (); + MSG_ReadVector(pos); S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation); } @@ -164,59 +163,49 @@ When the client is taking a long time to load stuff, send keepalive messages so the server doesn't disconnect. ================== */ + +static qbyte olddata[NET_MAXMESSAGE]; void CL_KeepaliveMessage (void) { - float time; + float time; static float lastmsg; - int ret; - int c; - sizebuf_t old; - qbyte olddata[8192]; - - if (sv.active) - return; // no need if server is local - if (cls.demoplayback) + int oldreadcount; + qboolean oldbadread; + sizebuf_t old; + + // no need if server is local and definitely not if this is a demo + if (sv.active || cls.demoplayback) return; // read messages from server, should just be nops + oldreadcount = msg_readcount; + oldbadread = msg_badread; old = net_message; - memcpy (olddata, net_message.data, net_message.cursize); + memcpy(olddata, net_message.data, net_message.cursize); - do - { - ret = CL_GetMessage (); - switch (ret) - { - default: - Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed"); - case 0: - break; // nothing waiting - case 1: - Host_Error ("CL_KeepaliveMessage: received a message"); - break; - case 2: - c = MSG_ReadByte(); - if (c != svc_nop) - Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop"); - break; - } - } while (ret); + NetConn_ClientFrame(); + msg_readcount = oldreadcount; + msg_badread = oldbadread; net_message = old; - memcpy (net_message.data, olddata, net_message.cursize); - -// check time - time = Sys_DoubleTime (); - if (time - lastmsg < 5) - return; - lastmsg = time; + memcpy(net_message.data, olddata, net_message.cursize); -// write out a nop - Con_Printf ("--> client to server keepalive\n"); - - MSG_WriteByte (&cls.message, clc_nop); - NET_SendMessage (cls.netcon, &cls.message); - SZ_Clear (&cls.message); + if (cls.netcon && NetConn_CanSendMessage(cls.netcon) && (time = Sys_DoubleTime()) - lastmsg >= 5) + { + sizebuf_t msg; + qbyte buf[4]; + lastmsg = time; + // write out a nop + // LordHavoc: must use unreliable because reliable could kill the sigon message! + Con_Printf("--> client to server keepalive\n"); + msg.data = buf; + msg.maxsize = sizeof(buf); + 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) @@ -228,25 +217,25 @@ void CL_ParseEntityLump(char *entdata) data = entdata; if (!data) return; - if (!COM_ParseToken(&data)) + if (!COM_ParseToken(&data, false)) return; // error if (com_token[0] != '{') return; // error while (1) { - if (!COM_ParseToken(&data)) + if (!COM_ParseToken(&data, false)) return; // error if (com_token[0] == '}') break; // end of worldspawn if (com_token[0] == '_') - strcpy(key, com_token + 1); + strlcpy (key, com_token + 1, sizeof (key)); else - strcpy(key, com_token); + strlcpy (key, com_token, sizeof (key)); while (key[strlen(key)-1] == ' ') // remove trailing spaces key[strlen(key)-1] = 0; - if (!COM_ParseToken(&data)) + if (!COM_ParseToken(&data, false)) return; // error - strcpy(value, com_token); + strlcpy (value, com_token, sizeof (value)); if (!strcmp("sky", key)) R_SetSkyBox(value); else if (!strcmp("skyname", key)) // non-standard, introduced by QuakeForge... sigh. @@ -299,6 +288,9 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); MSG_WriteString (&cls.message, va("pmodel %i\n", cl_pmodel.integer)); } + MSG_WriteByte (&cls.message, clc_stringcmd); + MSG_WriteString (&cls.message, va("rate %i\n", cl_rate.integer)); + MSG_WriteByte (&cls.message, clc_stringcmd); MSG_WriteString (&cls.message, "spawn"); break; @@ -338,19 +330,15 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) + // 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 ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); + 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); return; } - Nehahrademcompatibility = false; - if (i == 250) - Nehahrademcompatibility = true; - if (cls.demoplayback && demo_nehahra.integer) - Nehahrademcompatibility = true; - dpprotocol = i; - if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) - dpprotocol = 0; + cl.protocol = i; // parse maxclients cl.maxclients = MSG_ReadByte (); @@ -359,6 +347,7 @@ void CL_ParseServerInfo (void) Con_Printf("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)); // parse gametype @@ -366,13 +355,13 @@ void CL_ParseServerInfo (void) // parse signon message str = MSG_ReadString (); - strncpy (cl.levelname, str, sizeof(cl.levelname)-1); + strlcpy (cl.levelname, str, sizeof(cl.levelname)); // seperate the printfs so the server message can have a color - if (!Nehahrademcompatibility) // no messages when playing the Nehahra movie + if (cl.protocol != PROTOCOL_NEHAHRAMOVIE) // no messages when playing the Nehahra movie { Con_Printf("\n\n\35\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\36\37\n\n"); - Con_Printf ("%c%s\n", 2, str); + Con_Printf("%c%s\n", 2, str); } // check memory integrity @@ -381,77 +370,84 @@ void CL_ParseServerInfo (void) // disable until we get textures for it R_ResetSkyBox(); - memset (cl.model_precache, 0, sizeof(cl.model_precache)); - memset (cl.sound_precache, 0, sizeof(cl.sound_precache)); + 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(); + // parse model precache list for (nummodels=1 ; ; nummodels++) { - CL_KeepaliveMessage (); - str = MSG_ReadString (); + str = MSG_ReadString(); if (!str[0]) break; if (nummodels==MAX_MODELS) Host_Error ("Server sent too many model precaches\n"); if (strlen(str) >= MAX_QPATH) Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); - strcpy (parse_model_precache[nummodels], str); - Mod_TouchModel (str); + strlcpy (parse_model_precache[nummodels], str, sizeof (parse_model_precache[nummodels])); } - - // do the same for sounds + // parse sound precache list for (numsounds=1 ; ; numsounds++) { - CL_KeepaliveMessage (); - str = MSG_ReadString (); + str = MSG_ReadString(); 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\n"); if (strlen(str) >= MAX_QPATH) - Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1); - strcpy (parse_sound_precache[numsounds], str); - S_TouchSound (str); + 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])); } - // purge anything that was not touched + // touch all of the precached models that are still loaded so we can free + // anything that isn't needed + Mod_ClearUsed(); + for (i = 1;i < nummodels;i++) + { + CL_KeepaliveMessage(); + Mod_TouchModel(parse_model_precache[i]); + } Mod_PurgeUnused(); + // do the same for sounds + S_ClearUsed(); + for (i = 1;i < numsounds;i++) + { + CL_KeepaliveMessage(); + S_TouchSound(parse_sound_precache[i]); + } + S_PurgeUnused(); + // 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); + cl.model_precache[1] = Mod_ForName(parse_model_precache[1], false, false, true); if (cl.model_precache[1] == NULL) Con_Printf("Map %s not found\n", parse_model_precache[1]); // normal models for (i=2 ; istate_current.active = true; ent->render.model = cl.worldmodel = cl.model_precache[1]; - //ent->render.scale = 1; + ent->render.scale = 1; // some of the renderer still relies on scale ent->render.alpha = 1; - ent->render.flags = RENDER_SHADOW; + 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); CL_BoundingBoxForEntity(&ent->render); @@ -460,7 +456,7 @@ void CL_ParseServerInfo (void) cl_num_entities = 1; - R_Modules_NewMap (); + R_Modules_NewMap(); CL_CGVM_Start(); // noclip is turned off at start @@ -531,7 +527,7 @@ void CL_MoveLerpEntityStates(entity_t *ent) // 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) + if (cl.islocalgame) ent->persistent.lerpdeltatime = 0; else ent->persistent.lerpdeltatime = cl.mtime[0] - cl.mtime[1]; @@ -559,7 +555,7 @@ void CL_ParseUpdate (int bits) if (bits & U_MOREBITS) bits |= (MSG_ReadByte()<<8); - if ((bits & U_EXTEND1) && (!Nehahrademcompatibility)) + if ((bits & U_EXTEND1) && cl.protocol != PROTOCOL_NEHAHRAMOVIE) { bits |= MSG_ReadByte() << 16; if (bits & U_EXTEND2) @@ -618,7 +614,7 @@ void CL_ParseUpdate (int bits) if (bits & U_EXTERIORMODEL) new.flags |= RENDER_EXTERIORMODEL; // LordHavoc: to allow playback of the Nehahra movie - if (Nehahrademcompatibility && (bits & U_EXTEND1)) + if (cl.protocol == PROTOCOL_NEHAHRAMOVIE && (bits & U_EXTEND1)) { // LordHavoc: evil format int i = MSG_ReadFloat(); @@ -652,22 +648,32 @@ void CL_ParseUpdate (int bits) } static entity_frame_t entityframe; +extern mempool_t *cl_entities_mempool; void CL_ReadEntityFrame(void) { - entity_t *ent; - int i; - EntityFrame_Read(&cl.entitydatabase); - EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe); - for (i = 0;i < entityframe.numentities;i++) + if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3) { - // copy the states - ent = &cl_entities[entityframe.entitydata[i].number]; - ent->state_previous = ent->state_current; - ent->state_current = entityframe.entitydata[i]; - CL_MoveLerpEntityStates(ent); - // the entity lives again... - entlife[ent->state_current.number] = 2; - cl_entities_active[ent->state_current.number] = true; + int i; + entity_t *ent; + EntityFrame_Read(&cl.entitydatabase); + EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe); + for (i = 0;i < entityframe.numentities;i++) + { + // copy the states + ent = &cl_entities[entityframe.entitydata[i].number]; + ent->state_previous = ent->state_current; + ent->state_current = entityframe.entitydata[i]; + CL_MoveLerpEntityStates(ent); + // the entity lives again... + entlife[ent->state_current.number] = 2; + cl_entities_active[ent->state_current.number] = true; + } + } + else + { + if (!cl.entitydatabase4) + cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_entities_mempool); + EntityFrame4_CL_ReadFrame(cl.entitydatabase4); } } @@ -677,18 +683,21 @@ void CL_EntityUpdateSetup(void) void CL_EntityUpdateEnd(void) { - int i; - // disable entities that disappeared this frame - for (i = 1;i < MAX_EDICTS;i++) + if (cl.protocol == PROTOCOL_QUAKE || cl.protocol == PROTOCOL_NEHAHRAMOVIE || cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3) { - // clear only the entities that were active last frame but not this - // frame, don't waste time clearing all entities (which would cause - // cache misses) - if (entlife[i]) + int i; + // disable entities that disappeared this frame + for (i = 1;i < MAX_EDICTS;i++) { - entlife[i]--; - if (!entlife[i]) - cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; + // clear only the entities that were active last frame but not this + // frame, don't waste time clearing all entities (which would cause + // cache misses) + if (entlife[i]) + { + entlife[i]--; + if (!entlife[i]) + cl_entities[i].state_previous.active = cl_entities[i].state_current.active = 0; + } } } } @@ -702,7 +711,7 @@ void CL_ParseBaseline (entity_t *ent, int large) { int i; - memset(&ent->state_baseline, 0, sizeof(entity_state_t)); + ClearStateToDefault(&ent->state_baseline); ent->state_baseline.active = true; if (large) { @@ -721,13 +730,8 @@ void CL_ParseBaseline (entity_t *ent, int large) ent->state_baseline.origin[i] = MSG_ReadCoord (); ent->state_baseline.angles[i] = MSG_ReadAngle (); } - ent->state_baseline.alpha = 255; - ent->state_baseline.scale = 16; - ent->state_baseline.glowsize = 0; - ent->state_baseline.glowcolor = 254; - ent->state_previous = ent->state_current = ent->state_baseline; - CL_ValidateState(&ent->state_baseline); + ent->state_previous = ent->state_current = ent->state_baseline; } @@ -759,25 +763,46 @@ void CL_ParseClientdata (int bits) cl.idealpitch = 0; VectorCopy (cl.mvelocity[0], cl.mvelocity[1]); - for (i=0 ; i<3 ; i++) + if (cl.protocol == PROTOCOL_DARKPLACES5) { - if (bits & (SU_PUNCH1< 0) { - sprintf(temp, "%3i:%s ", cmdlog[i], cmdlogname[i]); - strcat(description, temp); + snprintf (temp, sizeof (temp), "%3i:%s ", cmdlog[i], cmdlogname[i]); + strlcat (description, temp, sizeof (description)); count--; i++; i &= 31; @@ -1473,6 +1515,8 @@ void CL_ParseServerMessage (void) break; case svc_nop: + if (cls.signon < SIGNONS) + Con_Printf("<-- server to client keepalive\n"); break; case svc_time: @@ -1494,16 +1538,12 @@ void CL_ParseServerMessage (void) case svc_version: i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) - Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); - Nehahrademcompatibility = false; - if (i == 250) - Nehahrademcompatibility = true; - if (cls.demoplayback && demo_nehahra.integer) - Nehahrademcompatibility = true; - dpprotocol = i; - if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) - dpprotocol = 0; + // 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; break; case svc_disconnect: @@ -1535,7 +1575,9 @@ void CL_ParseServerMessage (void) break; case svc_setview: - cl.viewentity = MSG_ReadShort (); + cl.viewentity = (unsigned short)MSG_ReadShort (); + if (cl.viewentity >= MAX_EDICTS) + Host_Error("svc_setview >= MAX_EDICTS\n"); // LordHavoc: assume first setview recieved is the real player entity if (!cl.playerentity) cl.playerentity = cl.viewentity; @@ -1545,7 +1587,7 @@ void CL_ParseServerMessage (void) i = MSG_ReadByte (); if (i >= MAX_LIGHTSTYLES) Host_Error ("svc_lightstyle >= MAX_LIGHTSTYLES"); - strncpy (cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING - 1); + 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); break; @@ -1567,7 +1609,7 @@ void CL_ParseServerMessage (void) i = MSG_ReadByte (); if (i >= cl.maxclients) Host_Error ("CL_ParseServerMessage: svc_updatename >= cl.maxclients"); - strcpy (cl.scores[i].name, MSG_ReadString ()); + strlcpy (cl.scores[i].name, MSG_ReadString (), sizeof (cl.scores[i].name)); break; case svc_updatefrags: @@ -1687,10 +1729,35 @@ void CL_ParseServerMessage (void) Cmd_ExecuteString ("help", src_command); break; case svc_hidelmp: - SHOWLMP_decodehide(); + if (gamemode == GAME_TENEBRAE) + { + // repeating particle effect + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadByte(); + MSG_ReadLong(); + MSG_ReadLong(); + MSG_ReadString(); + } + else + SHOWLMP_decodehide(); break; case svc_showlmp: - SHOWLMP_decodeshow(); + if (gamemode == GAME_TENEBRAE) + { + // particle effect + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadCoord(); + MSG_ReadByte(); + MSG_ReadString(); + } + else + SHOWLMP_decodeshow(); break; case svc_skybox: R_SetSkyBox(MSG_ReadString()); @@ -1735,7 +1802,9 @@ void CL_Parse_DumpPacket(void) void CL_Parse_Init(void) { // LordHavoc: added demo_nehahra cvar + cl_scores_mempool = Mem_AllocPool("client player info"); Cvar_RegisterVariable (&demo_nehahra); if (gamemode == GAME_NEHAHRA) Cvar_SetValue("demo_nehahra", 1); + Cvar_RegisterVariable(&developer_networkentities); }