X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=3ae47c56564cdb05b709a3a80b31d68f56db520f;hb=bd172244c077be2f4f13caf8cabd022fcad4bd33;hp=f6975f226eb2b91ca0a6a143c13ff3214e63c33b;hpb=8f1bbfe48545bc52b27524782b1570b8269212a5;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index f6975f22..3ae47c56 100644 --- a/protocol.c +++ b/protocol.c @@ -7,14 +7,7 @@ if(developer_networkentities.integer >= 2) \ { \ prvm_edict_t *ed = prog->edicts + num; \ - const char *cname = "(no classname)"; \ - if(prog->fieldoffsets.classname >= 0) \ - { \ - string_t handle = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.classname)->string; \ - if (handle) \ - cname = PRVM_GetString(handle); \ - } \ - Con_Printf("sent entity update of size %d for a %s\n", (msg->cursize - entityprofiling_startsize), cname); \ + Con_Printf("sent entity update of size %d for a %s\n", (msg->cursize - entityprofiling_startsize), PRVM_serveredictstring(ed, classname) ? PRVM_GetString(PRVM_serveredictstring(ed, classname)) : "(no classname)"); \ } // this is 88 bytes (must match entity_state_t in protocol.h) @@ -112,7 +105,7 @@ int Protocol_NumberForEnum(protocolversion_t p) int i; for (i = 0;protocolversioninfo[i].name;i++) if (protocolversioninfo[i].version == p) - return protocolversioninfo[p].number; + return protocolversioninfo[i].number; return 0; } @@ -279,20 +272,15 @@ static void EntityFrameCSQC_LostAllFrames(client_t *client) // mark ALL csqc entities as requiring a FULL resend! // I know this is a bad workaround, but better than nothing. int i, n; - prvm_eval_t *val; prvm_edict_t *ed; - if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0) - return; - n = client->csqcnumedicts; for(i = 0; i < n; ++i) { if(client->csqcentityglobalhistory[i]) { ed = prog->edicts + i; - val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); - if (val->function) + if (PRVM_serveredictfunction(ed, SendEntity)) client->csqcentitysendflags[i] |= 0xFFFFFF; // FULL RESEND else // if it was ever sent to that client as a CSQC entity { @@ -305,13 +293,16 @@ static void EntityFrameCSQC_LostAllFrames(client_t *client) void EntityFrameCSQC_LostFrame(client_t *client, int framenum) { // marks a frame as lost - int i, j, n; + int i, j; qboolean valid; int ringfirst, ringlast; static int recoversendflags[MAX_EDICTS]; csqcentityframedb_t *d; - n = client->csqcnumedicts; + if(client->csqcentityframe_lastreset < 0) + return; + if(framenum < client->csqcentityframe_lastreset) + return; // no action required, as we resent that data anyway // is our frame out of history? ringfirst = client->csqcentityframehistory_next; // oldest entry @@ -343,6 +334,7 @@ void EntityFrameCSQC_LostFrame(client_t *client, int framenum) Con_DPrintf("Lost frame = %d\n", framenum); Con_DPrintf("Entity DB = %d to %d\n", client->csqcentityframehistory[ringfirst].framenum, client->csqcentityframehistory[ringlast].framenum); EntityFrameCSQC_LostAllFrames(client); + client->csqcentityframe_lastreset = -1; } return; } @@ -443,16 +435,14 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers qboolean sectionstarted = false; const unsigned short *n; prvm_edict_t *ed; - prvm_eval_t *val; client_t *client = svs.clients + sv.writeentitiestoclient_clientnumber; int dbframe = EntityFrameCSQC_AllocFrame(client, framenum); csqcentityframedb_t *db = &client->csqcentityframehistory[dbframe]; - maxsize -= 24; // always fit in an empty svc_entities message (for packet loss detection!) + if(client->csqcentityframe_lastreset < 0) + client->csqcentityframe_lastreset = framenum; - // if this server progs is not CSQC-aware, return early - if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0) - return false; + maxsize -= 24; // always fit in an empty svc_entities message (for packet loss detection!) // make sure there is enough room to store the svc_csqcentities byte, // the terminator (0x0000) and at least one entity update @@ -475,8 +465,7 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers } } ed = prog->edicts + number; - val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); - if (val->function) + if (PRVM_serveredictfunction(ed, SendEntity)) client->csqcentityscope[number] = 2; else if (client->csqcentityscope[number]) { @@ -505,8 +494,7 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers { number = *n; ed = prog->edicts + number; - val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); - if (val->function) + if (PRVM_serveredictfunction(ed, SendEntity)) client->csqcentityscope[number] = 2; } */ @@ -555,8 +543,7 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers // save the cursize value in case we overflow and have to rollback int oldcursize = msg->cursize; client->csqcentityscope[number] = 1; - val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); - if (val->function) + if (PRVM_serveredictfunction(ed, SendEntity)) { if(!sectionstarted) MSG_WriteByte(msg, svc_csqcentities); @@ -567,7 +554,7 @@ qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers PRVM_G_INT(OFS_PARM0) = sv.writeentitiestoclient_cliententitynumber; PRVM_G_FLOAT(OFS_PARM1) = sendflags; prog->globals.server->self = number; - PRVM_ExecuteProgram(val->function, "Null SendEntity\n"); + PRVM_ExecuteProgram(PRVM_serveredictfunction(ed, SendEntity), "Null SendEntity\n"); msg->allowoverflow = false; if(PRVM_G_FLOAT(OFS_RETURN) && msg->cursize + 2 <= maxsize) { @@ -694,7 +681,6 @@ qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, int i, bits; sizebuf_t buf; unsigned char data[128]; - prvm_eval_t *val; qboolean success = false; // prepare the buffer @@ -706,8 +692,7 @@ qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, { ENTITYSIZEPROFILING_START(msg, states[i]->number); s = states[i]; - val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); - if(val && val->function) + if(PRVM_serveredictfunction((&prog->edicts[s->number]), SendEntity)) continue; // prepare the buffer @@ -1402,7 +1387,6 @@ qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_databas entity_frame_t *o = &d->deltaframe; const entity_state_t *ent, *delta; vec3_t eye; - prvm_eval_t *val; d->latestframenum++; @@ -1434,8 +1418,7 @@ qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_databas ent = states[i]; number = ent->number; - val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity); - if(val && val->function) + if (PRVM_serveredictfunction((&prog->edicts[number]), SendEntity)) continue; for (;onum < o->numentities && o->entitydata[onum].number < number;onum++) { @@ -1880,7 +1863,6 @@ qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_datab int i, n, startnumber; sizebuf_t buf; unsigned char data[128]; - prvm_eval_t *val; // if there isn't enough space to accomplish anything, skip it if (msg->cursize + 24 > maxsize) @@ -1925,8 +1907,7 @@ qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_datab d->currententitynumber = 1; for (i = 0, n = startnumber;n < prog->max_edicts;n++) { - val = PRVM_EDICTFIELDVALUE((&prog->edicts[n]), prog->fieldoffsets.SendEntity); - if(val && val->function) + if (PRVM_serveredictfunction((&prog->edicts[n]), SendEntity)) continue; // find the old state to delta from e = EntityFrame4_GetReferenceEntity(d, n); @@ -2036,7 +2017,7 @@ static void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax) static int EntityState5_Priority(entityframe5_database_t *d, int stateindex) { int limit, priority; - entity_state_t *s; + entity_state_t *s = NULL; // hush compiler warning by initializing this // if it is the player, update urgently if (stateindex == d->viewentnum) return ENTITYFRAME5_PRIORITYLEVELS - 1; @@ -2082,9 +2063,7 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi //dp_model_t *model; ENTITYSIZEPROFILING_START(msg, s->number); - prvm_eval_t *val; - val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); - if(val && val->function) + if (PRVM_serveredictfunction((&prog->edicts[s->number]), SendEntity)) return; if (s->active != ACTIVE_NETWORK) @@ -2225,11 +2204,80 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi MSG_WriteByte(msg, s->glowmod[1]); MSG_WriteByte(msg, s->glowmod[2]); } + if (bits & E5_COMPLEXANIMATION) + { + if (s->skeletonobject.model && s->skeletonobject.relativetransforms) + { + int numbones = s->skeletonobject.model->num_bones; + int bonenum; + short pose6s[6]; + MSG_WriteByte(msg, 4); + MSG_WriteShort(msg, s->modelindex); + MSG_WriteByte(msg, numbones); + for (bonenum = 0;bonenum < numbones;bonenum++) + { + Matrix4x4_ToBonePose6s(s->skeletonobject.relativetransforms + bonenum, 64, pose6s); + MSG_WriteShort(msg, pose6s[0]); + MSG_WriteShort(msg, pose6s[1]); + MSG_WriteShort(msg, pose6s[2]); + MSG_WriteShort(msg, pose6s[3]); + MSG_WriteShort(msg, pose6s[4]); + MSG_WriteShort(msg, pose6s[5]); + } + } + else if (s->framegroupblend[3].lerp > 0) + { + MSG_WriteByte(msg, 3); + MSG_WriteShort(msg, s->framegroupblend[0].frame); + MSG_WriteShort(msg, s->framegroupblend[1].frame); + MSG_WriteShort(msg, s->framegroupblend[2].frame); + MSG_WriteShort(msg, s->framegroupblend[3].frame); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0)); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[1].start) * 1000.0)); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[2].start) * 1000.0)); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[3].start) * 1000.0)); + MSG_WriteByte(msg, s->framegroupblend[0].lerp * 255.0f); + MSG_WriteByte(msg, s->framegroupblend[1].lerp * 255.0f); + MSG_WriteByte(msg, s->framegroupblend[2].lerp * 255.0f); + MSG_WriteByte(msg, s->framegroupblend[3].lerp * 255.0f); + } + else if (s->framegroupblend[2].lerp > 0) + { + MSG_WriteByte(msg, 2); + MSG_WriteShort(msg, s->framegroupblend[0].frame); + MSG_WriteShort(msg, s->framegroupblend[1].frame); + MSG_WriteShort(msg, s->framegroupblend[2].frame); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0)); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[1].start) * 1000.0)); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[2].start) * 1000.0)); + MSG_WriteByte(msg, s->framegroupblend[0].lerp * 255.0f); + MSG_WriteByte(msg, s->framegroupblend[1].lerp * 255.0f); + MSG_WriteByte(msg, s->framegroupblend[2].lerp * 255.0f); + } + else if (s->framegroupblend[1].lerp > 0) + { + MSG_WriteByte(msg, 1); + MSG_WriteShort(msg, s->framegroupblend[0].frame); + MSG_WriteShort(msg, s->framegroupblend[1].frame); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0)); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[1].start) * 1000.0)); + MSG_WriteByte(msg, s->framegroupblend[0].lerp * 255.0f); + MSG_WriteByte(msg, s->framegroupblend[1].lerp * 255.0f); + } + else + { + MSG_WriteByte(msg, 0); + MSG_WriteShort(msg, s->framegroupblend[0].frame); + MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0)); + } + } } ENTITYSIZEPROFILING_END(msg, s->number); } +extern dp_model_t *CL_GetModelByIndex(int modelindex); + static void EntityState5_ReadUpdate(entity_state_t *s, int number) { int bits; @@ -2343,6 +2391,107 @@ static void EntityState5_ReadUpdate(entity_state_t *s, int number) s->glowmod[1] = MSG_ReadByte(); s->glowmod[2] = MSG_ReadByte(); } + if (bits & E5_COMPLEXANIMATION) + { + skeleton_t *skeleton; + const dp_model_t *model; + int modelindex; + int type; + int bonenum; + int numbones; + short pose6s[6]; + type = MSG_ReadByte(); + switch(type) + { + case 0: + s->framegroupblend[0].frame = MSG_ReadShort(); + s->framegroupblend[1].frame = 0; + s->framegroupblend[2].frame = 0; + s->framegroupblend[3].frame = 0; + s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[1].start = 0; + s->framegroupblend[2].start = 0; + s->framegroupblend[3].start = 0; + s->framegroupblend[0].lerp = 1; + s->framegroupblend[1].lerp = 0; + s->framegroupblend[2].lerp = 0; + s->framegroupblend[3].lerp = 0; + break; + case 1: + s->framegroupblend[0].frame = MSG_ReadShort(); + s->framegroupblend[1].frame = MSG_ReadShort(); + s->framegroupblend[2].frame = 0; + s->framegroupblend[3].frame = 0; + s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[1].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[2].start = 0; + s->framegroupblend[3].start = 0; + s->framegroupblend[0].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[1].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[2].lerp = 0; + s->framegroupblend[3].lerp = 0; + break; + case 2: + s->framegroupblend[0].frame = MSG_ReadShort(); + s->framegroupblend[1].frame = MSG_ReadShort(); + s->framegroupblend[2].frame = MSG_ReadShort(); + s->framegroupblend[3].frame = 0; + s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[1].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[2].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[3].start = 0; + s->framegroupblend[0].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[1].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[2].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[3].lerp = 0; + break; + case 3: + s->framegroupblend[0].frame = MSG_ReadShort(); + s->framegroupblend[1].frame = MSG_ReadShort(); + s->framegroupblend[2].frame = MSG_ReadShort(); + s->framegroupblend[3].frame = MSG_ReadShort(); + s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[1].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[2].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[3].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f); + s->framegroupblend[0].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[1].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[2].lerp = MSG_ReadByte() * (1.0f / 255.0f); + s->framegroupblend[3].lerp = MSG_ReadByte() * (1.0f / 255.0f); + break; + case 4: + if (!cl.engineskeletonobjects) + cl.engineskeletonobjects = (skeleton_t *) Mem_Alloc(cls.levelmempool, sizeof(*cl.engineskeletonobjects) * MAX_EDICTS); + skeleton = &cl.engineskeletonobjects[number]; + modelindex = MSG_ReadShort(); + model = CL_GetModelByIndex(modelindex); + numbones = MSG_ReadByte(); + if (model && numbones != model->num_bones) + Host_Error("E5_COMPLEXANIMATION: model has different number of bones than network packet describes\n"); + if (!skeleton->relativetransforms || skeleton->model != model) + { + skeleton->model = model; + skeleton->relativetransforms = (matrix4x4_t *) Mem_Realloc(cls.levelmempool, skeleton->relativetransforms, sizeof(*skeleton->relativetransforms) * skeleton->model->num_bones); + for (bonenum = 0;bonenum < model->num_bones;bonenum++) + skeleton->relativetransforms[bonenum] = identitymatrix; + } + for (bonenum = 0;bonenum < numbones;bonenum++) + { + pose6s[0] = (short)MSG_ReadShort(); + pose6s[1] = (short)MSG_ReadShort(); + pose6s[2] = (short)MSG_ReadShort(); + pose6s[3] = (short)MSG_ReadShort(); + pose6s[4] = (short)MSG_ReadShort(); + pose6s[5] = (short)MSG_ReadShort(); + Matrix4x4_FromBonePose6s(skeleton->relativetransforms + bonenum, 1.0f / 64.0f, pose6s); + } + s->skeletonobject = *skeleton; + break; + default: + Host_Error("E5_COMPLEXANIMATION: Parse error - unknown type %i\n", type); + break; + } + } if (developer_networkentities.integer >= 2) @@ -2441,6 +2590,8 @@ static int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t bits |= E5_COLORMOD; if (o->glowmod[0] != n->glowmod[0] || o->glowmod[1] != n->glowmod[1] || o->glowmod[2] != n->glowmod[2]) bits |= E5_GLOWMOD; + if (n->flags & RENDER_COMPLEXANIMATION) + bits |= E5_COMPLEXANIMATION; } else if (o->active == ACTIVE_NETWORK) @@ -2507,68 +2658,72 @@ void EntityFrame5_CL_ReadFrame(void) } } +static int packetlog5cmp(const void *a_, const void *b_) +{ + const entityframe5_packetlog_t *a = (const entityframe5_packetlog_t *) a_; + const entityframe5_packetlog_t *b = (const entityframe5_packetlog_t *) b_; + return a->packetnumber - b->packetnumber; +} + void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum) { - int i, j, k, l, bits; - entityframe5_changestate_t *s, *s2; - entityframe5_packetlog_t *p, *p2; - unsigned char statsdeltabits[(MAX_CL_STATS+7)/8]; - // scan for packets that were lost + int i, j, l, bits; + entityframe5_changestate_t *s; + entityframe5_packetlog_t *p; + static unsigned char statsdeltabits[(MAX_CL_STATS+7)/8]; + static int deltabits[MAX_EDICTS]; + entityframe5_packetlog_t *packetlogs[ENTITYFRAME5_MAXPACKETLOGS]; + for (i = 0, p = d->packetlog;i < ENTITYFRAME5_MAXPACKETLOGS;i++, p++) + packetlogs[i] = p; + qsort(packetlogs, sizeof(*packetlogs), ENTITYFRAME5_MAXPACKETLOGS, packetlog5cmp); + + memset(deltabits, 0, sizeof(deltabits)); + memset(statsdeltabits, 0, sizeof(statsdeltabits)); + for (i = 0; i < ENTITYFRAME5_MAXPACKETLOGS; i++) { - if (p->packetnumber && p->packetnumber <= framenum) + p = packetlogs[i]; + + if (!p->packetnumber) + continue; + + if (p->packetnumber <= framenum) { - // packet was lost - merge deltabits into the main array so they - // will be re-sent, but only if there is no newer update of that - // bit in the logs (as those will arrive before this update) for (j = 0, s = p->states;j < p->numstates;j++, s++) - { - // check for any newer updates to this entity and mask off any - // overlapping bits (we don't need to send something again if - // it has already been sent more recently) - bits = s->bits & ~d->deltabits[s->number]; - for (k = 0, p2 = d->packetlog;k < ENTITYFRAME5_MAXPACKETLOGS && bits;k++, p2++) - { - if (p2->packetnumber > framenum) - { - for (l = 0, s2 = p2->states;l < p2->numstates;l++, s2++) - { - if (s2->number == s->number) - { - bits &= ~s2->bits; - break; - } - } - } - } - // if the bits haven't all been cleared, there were some bits - // lost with this packet, so set them again now - if (bits) - { - d->deltabits[s->number] |= bits; - // if it was a very important update, set priority higher - if (bits & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_COLORMAP)) - d->priorities[s->number] = max(d->priorities[s->number], 4); - else - d->priorities[s->number] = max(d->priorities[s->number], 1); - } - } - // mark lost stats - for (j = 0;j < MAX_CL_STATS;j++) - { - for (l = 0;l < (MAX_CL_STATS+7)/8;l++) - statsdeltabits[l] = p->statsdeltabits[l] & ~host_client->statsdeltabits[l]; - for (k = 0, p2 = d->packetlog;k < ENTITYFRAME5_MAXPACKETLOGS;k++, p2++) - if (p2->packetnumber > framenum) - for (l = 0;l < (MAX_CL_STATS+7)/8;l++) - statsdeltabits[l] = p->statsdeltabits[l] & ~p2->statsdeltabits[l]; - for (l = 0;l < (MAX_CL_STATS+7)/8;l++) - host_client->statsdeltabits[l] |= statsdeltabits[l]; - } - // delete this packet log as it is now obsolete + deltabits[s->number] |= s->bits; + + for (l = 0;l < (MAX_CL_STATS+7)/8;l++) + statsdeltabits[l] |= p->statsdeltabits[l]; + p->packetnumber = 0; } + else + { + for (j = 0, s = p->states;j < p->numstates;j++, s++) + deltabits[s->number] &= ~s->bits; + for (l = 0;l < (MAX_CL_STATS+7)/8;l++) + statsdeltabits[l] &= ~p->statsdeltabits[l]; + } } + + for(i = 0; i < d->maxedicts; ++i) + { + bits = deltabits[i] & ~d->deltabits[i]; + if(bits) + { + d->deltabits[i] |= bits; + // if it was a very important update, set priority higher + if (bits & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_COLORMAP)) + d->priorities[i] = max(d->priorities[i], 4); + else + d->priorities[i] = max(d->priorities[i], 1); + } + } + + for (l = 0;l < (MAX_CL_STATS+7)/8;l++) + host_client->statsdeltabits[l] |= statsdeltabits[l]; + // no need to mask out the already-set bits here, as we do not + // do that priorities stuff } void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum) @@ -2868,10 +3023,10 @@ void EntityStateQW_ReadPlayerUpdate(void) if (bits & QW_CM_UP) MSG_ReadShort(); // cmd->upmove if (bits & QW_CM_BUTTONS) - MSG_ReadByte(); // cmd->buttons + (void) MSG_ReadByte(); // cmd->buttons if (bits & QW_CM_IMPULSE) - MSG_ReadByte(); // cmd->impulse - MSG_ReadByte(); // cmd->msec + (void) MSG_ReadByte(); // cmd->impulse + (void) MSG_ReadByte(); // cmd->msec } if (playerflags & QW_PF_VELOCITY1) velocity[0] = MSG_ReadShort();