X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=896ddf0e251fbf0d1d17d0131a222fae552f0b51;hb=1d8d93b453624e0cd4e31b81b360fa826a115c9e;hp=ed530fdd3ded6e4ef4ebbe96877e1940e6c02de7;hpb=069527b0cff9d91784bba159329e01b0b94df752;p=xonotic%2Fdarkplaces.git diff --git a/cl_parse.c b/cl_parse.c index ed530fdd..896ddf0e 100644 --- a/cl_parse.c +++ b/cl_parse.c @@ -81,7 +81,7 @@ char *svc_strings[128] = "", // 48 "", // 49 "svc_cgame", // 50 // [short] length [bytes] data - "svc_fog", // 51 // unfinished and obsolete + "svc_unusedlh1", // 51 // unused "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 @@ -107,35 +107,6 @@ void CL_Parse_Init(void) qboolean Nehahrademcompatibility; // LordHavoc: to allow playback of the early Nehahra movie segments int dpprotocol; // LordHavoc: version of network protocol, or 0 if not DarkPlaces -/* -=============== -CL_EntityNum - -This error checks and tracks the total number of entities -=============== -*/ -entity_t *CL_EntityNum (int num) -{ - /* - if (num >= cl.num_entities) - { - if (num >= MAX_EDICTS) - Host_Error ("CL_EntityNum: %i is an invalid number",num); - cl.num_entities = num; -// while (cl.num_entities <= num) -// { -// cl_entities[cl.num_entities].colormap = -1; // no special coloring -// cl.num_entities++; -// } - } - */ - if (num >= MAX_EDICTS) - Host_Error ("CL_EntityNum: %i is an invalid number",num); - - return &cl_entities[num]; -} - - /* ================== CL_ParseStartSoundPacket @@ -151,7 +122,7 @@ void CL_ParseStartSoundPacket(int largesoundindex) float attenuation; int i; - field_mask = MSG_ReadByte(); + field_mask = MSG_ReadByte(); if (field_mask & SND_VOLUME) volume = MSG_ReadByte (); @@ -182,7 +153,7 @@ void CL_ParseStartSoundPacket(int largesoundindex) pos[i] = MSG_ReadCoord (); S_StartSound (ent, channel, cl.sound_precache[sound_num], pos, volume/255.0, attenuation); -} +} /* ================== @@ -197,6 +168,7 @@ void CL_KeepaliveMessage (void) float time; static float lastmsg; int ret; + int c; sizebuf_t old; qbyte olddata[8192]; @@ -215,14 +187,15 @@ void CL_KeepaliveMessage (void) switch (ret) { default: - Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed"); + Host_Error ("CL_KeepaliveMessage: CL_GetMessage failed"); case 0: break; // nothing waiting case 1: Host_Error ("CL_KeepaliveMessage: received a message"); break; case 2: - if (MSG_ReadByte() != svc_nop) + c = MSG_ReadByte(); + if (c != svc_nop) Host_Error ("CL_KeepaliveMessage: datagram wasn't a nop"); break; } @@ -304,7 +277,7 @@ An svc_signonnum has been received, perform a client side setup */ static void CL_SignonReply (void) { - char str[8192]; + //char str[8192]; Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); @@ -329,8 +302,9 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); } MSG_WriteByte (&cls.message, clc_stringcmd); - sprintf (str, "spawn %s", cls.spawnparms); - MSG_WriteString (&cls.message, str); + //sprintf (str, "spawn %s", cls.spawnparms); + //MSG_WriteString (&cls.message, str); + MSG_WriteString (&cls.message, "spawn"); break; case 3: @@ -339,7 +313,6 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); break; case 4: - SCR_EndLoadingPlaque (); // allow normal screen updates Con_ClearNotify(); break; } @@ -350,13 +323,15 @@ Con_DPrintf ("CL_SignonReply: %i\n", cls.signon); CL_ParseServerInfo ================== */ +qbyte entlife[MAX_EDICTS]; void CL_ParseServerInfo (void) { - char *str; - int i; - int nummodels, numsounds; - char model_precache[MAX_MODELS][MAX_QPATH]; - char sound_precache[MAX_SOUNDS][MAX_QPATH]; + char *str; + int i; + int nummodels, numsounds; + char model_precache[MAX_MODELS][MAX_QPATH]; + char sound_precache[MAX_SOUNDS][MAX_QPATH]; + entity_t *ent; Con_DPrintf ("Serverinfo packet received.\n"); // @@ -366,9 +341,9 @@ void CL_ParseServerInfo (void) // parse protocol version number i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != 250) + if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != DPPROTOCOL_VERSION3 && i != 250) { - Con_Printf ("Server is protocol %i, not %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, PROTOCOL_VERSION); + Con_Printf ("Server is protocol %i, not %i, %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, DPPROTOCOL_VERSION3, PROTOCOL_VERSION); return; } Nehahrademcompatibility = false; @@ -377,7 +352,7 @@ void CL_ParseServerInfo (void) if (cls.demoplayback && demo_nehahra.integer) Nehahrademcompatibility = true; dpprotocol = i; - if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2) + if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) dpprotocol = 0; // parse maxclients @@ -471,15 +446,24 @@ void CL_ParseServerInfo (void) S_BeginPrecaching (); for (i=1 ; istate_current.active = true; + ent->render.model = cl.worldmodel = cl.model_precache[1]; + ent->render.scale = 1; + ent->render.alpha = 1; + VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins); + VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs); + // clear entlife array + memset(entlife, 0, MAX_EDICTS); + + cl_num_entities = 1; R_NewMap (); @@ -508,12 +492,12 @@ void CL_ValidateState(entity_state_t *s) Mod_CheckLoaded(model); if (model && s->frame >= model->numframes) { - Con_Printf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name); + Con_DPrintf("CL_ValidateState: no such frame %i in \"%s\"\n", s->frame, model->name); s->frame = 0; } if (model && s->skin > 0 && s->skin >= model->numskins) { - Con_Printf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name); + Con_DPrintf("CL_ValidateState: no such skin %i in \"%s\"\n", s->skin, model->name); s->skin = 0; } } @@ -527,11 +511,10 @@ If an entities model or origin changes from frame to frame, it must be relinked. Other attributes can change without relinking. ================== */ -qbyte entkill[MAX_EDICTS]; int bitprofile[32], bitprofilecount = 0; void CL_ParseUpdate (int bits) { - int i, num, deltadie; + int i, num; entity_t *ent; entity_state_t new; @@ -554,30 +537,27 @@ void CL_ParseUpdate (int bits) if (num < 1) Host_Error("CL_ParseUpdate: invalid entity number (%i)\n", num); - // mark as visible (no kill) - entkill[num] = 0; - - ent = CL_EntityNum (num); + ent = cl_entities + num; for (i = 0;i < 32;i++) if (bits & (1 << i)) bitprofile[i]++; bitprofilecount++; - deltadie = false; + // note: this inherits the 'active' state of the baseline chosen + // (state_baseline is always active, state_current may not be active if + // the entity was missing in the last frame) if (bits & U_DELTA) - { new = ent->state_current; - if (!new.active) - deltadie = true; // was not present in previous frame, leave hidden until next full update - } else + { new = ent->state_baseline; + new.active = true; + } + new.number = num; new.time = cl.mtime[0]; - new.flags = 0; - new.active = true; if (bits & U_MODEL) new.modelindex = (new.modelindex & 0xFF00) | MSG_ReadByte(); if (bits & U_FRAME) new.frame = (new.frame & 0xFF00) | MSG_ReadByte(); if (bits & U_COLORMAP) new.colormap = MSG_ReadByte(); @@ -595,12 +575,8 @@ void CL_ParseUpdate (int bits) if (bits & U_EFFECTS2) new.effects = (new.effects & 0x00FF) | (MSG_ReadByte() << 8); if (bits & U_GLOWSIZE) new.glowsize = MSG_ReadByte(); if (bits & U_GLOWCOLOR) new.glowcolor = MSG_ReadByte(); -#if 0 - if (bits & U_COLORMOD) {int i = MSG_ReadByte();float r = (((int) i >> 5) & 7) * 1.0 / 7, g = (((int) i >> 2) & 7) * 1.0 / 7, b = ((int) i & 3) * 1.0 / 3;Con_Printf("warning: U_COLORMOD %i (%1.2f %1.2f %1.2f) ignored\n", i, r, g, b);} -#else // apparently the dpcrush demo uses this (unintended, and it uses white anyway) if (bits & U_COLORMOD) MSG_ReadByte(); -#endif if (bits & U_GLOWTRAIL) new.flags |= RENDER_GLOWTRAIL; if (bits & U_FRAME2) new.frame = (new.frame & 0x00FF) | (MSG_ReadByte() << 8); if (bits & U_MODEL2) new.modelindex = (new.modelindex & 0x00FF) | (MSG_ReadByte() << 8); @@ -615,7 +591,8 @@ void CL_ParseUpdate (int bits) int j = MSG_ReadFloat() * 255.0f; if (i == 2) { - if (MSG_ReadFloat()) + i = MSG_ReadFloat(); + if (i) new.effects |= EF_FULLBRIGHT; } if (j < 0) @@ -626,12 +603,7 @@ void CL_ParseUpdate (int bits) new.alpha = j; } - if (deltadie) - { - // hide the entity - new.active = false; - } - else + if (new.active) CL_ValidateState(&new); if (new.flags & RENDER_STEP) // FIXME: rename this flag? @@ -654,24 +626,31 @@ void CL_ParseUpdate (int bits) ent->state_previous = ent->state_current; ent->state_current = new; } + if (ent->state_current.active) + { + cl_entities_active[ent->state_current.number] = true; + // mark as visible (no kill this frame) + entlife[ent->state_current.number] = 2; + } } void CL_ReadEntityFrame(void) { entity_t *ent; - entity_state_t *s; entity_frame_t entityframe; int i; EntityFrame_Read(&cl.entitydatabase); EntityFrame_FetchFrame(&cl.entitydatabase, EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase), &entityframe); for (i = 0;i < entityframe.numentities;i++) { - s = &entityframe.entitydata[i]; - entkill[s->number] = 0; - ent = &cl_entities[s->number]; - memcpy(&ent->state_previous, &ent->state_current, sizeof(*s)); - memcpy(&ent->state_current, s, sizeof(*s)); + // copy the states + ent = &cl_entities[entityframe.entitydata[i].number]; + ent->state_previous = ent->state_current; + ent->state_current = entityframe.entitydata[i]; ent->state_current.time = cl.mtime[0]; + // the entity lives again... + entlife[ent->state_current.number] = 2; + cl_entities_active[ent->state_current.number] = true; } VectorCopy(cl.viewentoriginnew, cl.viewentoriginold); VectorCopy(entityframe.eye, cl.viewentoriginnew); @@ -719,8 +698,7 @@ void CL_BitProfile_f(void) Con_Printf("bitprofile: %i updates\n"); if (bitprofilecount) for (i = 0;i < 32;i++) -// if (bitprofile[i]) - Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount); + Con_Printf("%s: %i %3.2f%%\n", bitprofilenames[i], bitprofile[i], bitprofile[i] * 100.0 / bitprofilecount); Con_Printf("\n"); for (i = 0;i < 32;i++) bitprofile[i] = 0; @@ -729,15 +707,24 @@ void CL_BitProfile_f(void) void CL_EntityUpdateSetup(void) { - memset(entkill, 1, MAX_EDICTS); } void CL_EntityUpdateEnd(void) { int i; + // disable entities that disappeared this frame for (i = 1;i < MAX_EDICTS;i++) - if (entkill[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; + } + } } /* @@ -879,9 +866,9 @@ void CL_ParseStatic (int large) { entity_t *ent; - if (cl.num_statics >= MAX_STATIC_ENTITIES) + if (cl_num_static_entities >= cl_max_static_entities) Host_Error ("Too many static entities"); - ent = &cl_static_entities[cl.num_statics++]; + ent = &cl_static_entities[cl_num_static_entities++]; CL_ParseBaseline (ent, large); // copy it to the current state @@ -898,7 +885,29 @@ void CL_ParseStatic (int large) ent->render.alpha = 1; VectorCopy (ent->state_baseline.origin, ent->render.origin); - VectorCopy (ent->state_baseline.angles, ent->render.angles); + VectorCopy (ent->state_baseline.angles, ent->render.angles); + + if (ent->render.angles[0] || ent->render.angles[2]) + { + // pitch or roll + VectorAdd(ent->render.origin, ent->render.model->rotatedmins, ent->render.mins); + VectorAdd(ent->render.origin, ent->render.model->rotatedmaxs, ent->render.maxs); + } + else if (ent->render.angles[1]) + { + // yaw + VectorAdd(ent->render.origin, ent->render.model->yawmins, ent->render.mins); + VectorAdd(ent->render.origin, ent->render.model->yawmaxs, ent->render.maxs); + } + else + { + VectorAdd(ent->render.origin, ent->render.model->normalmins, ent->render.mins); + VectorAdd(ent->render.origin, ent->render.model->normalmaxs, ent->render.maxs); + } + + // This is definitely cheating... + if (ent->render.model == NULL) + cl_num_static_entities--; } /* @@ -983,7 +992,6 @@ void CL_ParseServerMessage (void) MSG_BeginReading (); entitiesupdated = false; - CL_EntityUpdateSetup(); while (1) { @@ -1010,7 +1018,8 @@ void CL_ParseServerMessage (void) cmdlogname[cmdindex] = temp; SHOWNET("fast update"); if (cls.signon == SIGNONS - 1) - { // first update is the final signon stage + { + // first update is the final signon stage cls.signon = SIGNONS; CL_SignonReply (); } @@ -1055,12 +1064,16 @@ void CL_ParseServerMessage (void) break; case svc_nop: -// Con_Printf ("svc_nop\n"); break; case svc_time: - // handle old protocols which do not have entity update ranges - entitiesupdated = true; + if (!entitiesupdated) + { + // this is a new frame, we'll be seeing entities, + // so prepare for entity updates + CL_EntityUpdateSetup(); + entitiesupdated = true; + } cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = MSG_ReadFloat (); break; @@ -1072,15 +1085,15 @@ void CL_ParseServerMessage (void) case svc_version: i = MSG_ReadLong (); - if (i != PROTOCOL_VERSION && i != DPPROTOCOL_VERSION1 && i != DPPROTOCOL_VERSION2 && i != 250) - Host_Error ("CL_ParseServerMessage: Server is protocol %i, not %i, %i or %i", i, DPPROTOCOL_VERSION1, DPPROTOCOL_VERSION2, PROTOCOL_VERSION); + 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) + if (dpprotocol != DPPROTOCOL_VERSION1 && dpprotocol != DPPROTOCOL_VERSION2 && dpprotocol != DPPROTOCOL_VERSION3) dpprotocol = 0; break; @@ -1105,7 +1118,6 @@ void CL_ParseServerMessage (void) case svc_serverinfo: CL_ParseServerInfo (); -// vid.recalc_refdef = true; // leave intermission full screen break; case svc_setangle: @@ -1115,6 +1127,9 @@ void CL_ParseServerMessage (void) case svc_setview: cl.viewentity = MSG_ReadShort (); + // LordHavoc: assume first setview recieved is the real player entity + if (!cl.playerentity) + cl.playerentity = cl.viewentity; break; case svc_lightstyle: @@ -1158,6 +1173,9 @@ void CL_ParseServerMessage (void) if (i >= cl.maxclients) Host_Error ("CL_ParseServerMessage: svc_updatecolors >= cl.maxclients"); cl.scores[i].colors = MSG_ReadByte (); + // update our color cvar if our color changed + if (i == cl.playerentity - 1) + Cvar_SetValue ("_cl_color", cl.scores[i].colors); break; case svc_particle: @@ -1174,13 +1192,15 @@ void CL_ParseServerMessage (void) case svc_spawnbaseline: i = MSG_ReadShort (); - // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i), false); + if (i < 0 || i >= MAX_EDICTS) + Host_Error ("CL_ParseServerMessage: svc_spawnbaseline: invalid entity number %i", i); + CL_ParseBaseline (cl_entities + i, false); break; case svc_spawnbaseline2: i = MSG_ReadShort (); - // must use CL_EntityNum() to force cl.num_entities up - CL_ParseBaseline (CL_EntityNum(i), true); + if (i < 0 || i >= MAX_EDICTS) + Host_Error ("CL_ParseServerMessage: svc_spawnbaseline2: invalid entity number %i", i); + CL_ParseBaseline (cl_entities + i, true); break; case svc_spawnstatic: CL_ParseStatic (false); @@ -1243,20 +1263,17 @@ void CL_ParseServerMessage (void) case svc_intermission: cl.intermission = 1; cl.completed_time = cl.time; -// vid.recalc_refdef = true; // go to full screen break; case svc_finale: cl.intermission = 2; cl.completed_time = cl.time; -// vid.recalc_refdef = true; // go to full screen SCR_CenterPrint (MSG_ReadString ()); break; case svc_cutscene: cl.intermission = 3; cl.completed_time = cl.time; -// vid.recalc_refdef = true; // go to full screen SCR_CenterPrint (MSG_ReadString ()); break; @@ -1276,15 +1293,6 @@ void CL_ParseServerMessage (void) { int length; length = (int) ((unsigned short) MSG_ReadShort()); - /* - if (cgamenetbuffersize < length) - { - cgamenetbuffersize = length; - if (cgamenetbuffer) - Mem_Free(cgamenetbuffer); - cgamenetbuffer = Mem_Alloc(cgamenetbuffersize); - } - */ for (i = 0;i < length;i++) cgamenetbuffer[i] = MSG_ReadByte(); if (!msg_badread) @@ -1293,7 +1301,8 @@ void CL_ParseServerMessage (void) break; case svc_entities: if (cls.signon == SIGNONS - 1) - { // first update is the final signon stage + { + // first update is the final signon stage cls.signon = SIGNONS; CL_SignonReply (); } @@ -1305,3 +1314,4 @@ void CL_ParseServerMessage (void) if (entitiesupdated) CL_EntityUpdateEnd(); } +