X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=38e6783b5f5a158d3117dbcb896161564d8e548d;hb=f400f01187c4082af9b2d82c1863bf9a848d6b11;hp=0c966f8e07635814f2e914c94e92b5f27210a970;hpb=ea4fc545e8444f579d88d8f096b054dcd7bc482f;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index 0c966f8e..38e6783b 100644 --- a/protocol.c +++ b/protocol.c @@ -30,9 +30,9 @@ entity_state_t defaultstate = 254,//unsigned char glowcolor; 0,//unsigned char flags; 0,//unsigned char tagindex; - 255,//unsigned char colormod; + {32, 32, 32},//unsigned char colormod[3]; // padding to a multiple of 8 bytes (to align the double time) - {0,0,0,0}//unsigned char unused[4]; // ! + {0,0}//unsigned char unused[2]; // ! }; // keep track of quake entities because they need to be killed if they get stale @@ -64,6 +64,13 @@ void EntityFrameQuake_ReadEntity(int bits) if (num < 1) Host_Error("EntityFrameQuake_ReadEntity: invalid entity number (%i)\n", num); + if (cl_num_entities <= num) + { + cl_num_entities = num + 1; + if (num >= cl_max_entities) + CL_ExpandEntities(num); + } + ent = cl_entities + num; // note: this inherits the 'active' state of the baseline chosen @@ -100,7 +107,7 @@ void EntityFrameQuake_ReadEntity(int bits) if (bits & U_EFFECTS2) s.effects = (s.effects & 0x00FF) | (MSG_ReadByte() << 8); if (bits & U_GLOWSIZE) s.glowsize = MSG_ReadByte(); if (bits & U_GLOWCOLOR) s.glowcolor = MSG_ReadByte(); - if (bits & U_COLORMOD) s.colormod = MSG_ReadByte(); + if (bits & U_COLORMOD) {int c = MSG_ReadByte();s.colormod[0] = (qbyte)(((c >> 5) & 7) * (32.0f / 7.0f));s.colormod[1] = (qbyte)(((c >> 2) & 7) * (32.0f / 7.0f));s.colormod[2] = (qbyte)((c & 3) * (32.0f / 3.0f));} if (bits & U_GLOWTRAIL) s.flags |= RENDER_GLOWTRAIL; if (bits & U_FRAME2) s.frame = (s.frame & 0x00FF) | (MSG_ReadByte() << 8); if (bits & U_MODEL2) s.modelindex = (s.modelindex & 0x00FF) | (MSG_ReadByte() << 8); @@ -146,25 +153,21 @@ void EntityFrameQuake_ISeeDeadEntities(void) return; lastentity = cl_lastquakeentity; cl_lastquakeentity = 0; - for (num = 0;num < lastentity;num++) + for (num = 0;num <= lastentity;num++) { if (cl_isquakeentity[num]) { - cl_isquakeentity[num] = false; - if (cl_entities_active[num]) + if (cl_entities_active[num] && cl_entities[num].state_current.time == cl.mtime[0]) { - if (cl_entities[num].state_current.time == cl.mtime[0]) - { - cl_isquakeentity[num] = true; - cl_lastquakeentity = num; - } - else - { - cl_isquakeentity[num] = false; - cl_entities_active[num] = false; - cl_entities[num].state_current = defaultstate; - cl_entities[num].state_current.number = num; - } + cl_isquakeentity[num] = true; + cl_lastquakeentity = num; + } + else + { + cl_isquakeentity[num] = false; + cl_entities_active[num] = false; + cl_entities[num].state_current = defaultstate; + cl_entities[num].state_current.number = num; } } } @@ -282,7 +285,7 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta if (bits & U_EFFECTS2) MSG_WriteByte(&buf, s->effects >> 8); if (bits & U_GLOWSIZE) MSG_WriteByte(&buf, s->glowsize); if (bits & U_GLOWCOLOR) MSG_WriteByte(&buf, s->glowcolor); - if (bits & U_COLORMOD) MSG_WriteByte(&buf, s->colormod); + if (bits & U_COLORMOD) {int c = ((int)bound(0, s->colormod[0] * (7.0f / 32.0f), 7) << 5) | ((int)bound(0, s->colormod[0] * (7.0f / 32.0f), 7) << 2) | ((int)bound(0, s->colormod[0] * (3.0f / 32.0f), 3) << 0);MSG_WriteByte(&buf, c);} if (bits & U_FRAME2) MSG_WriteByte(&buf, s->frame >> 8); if (bits & U_MODEL2) MSG_WriteByte(&buf, s->modelindex >> 8); @@ -389,7 +392,7 @@ void EntityState_WriteFields(const entity_state_t *ent, sizebuf_t *msg, unsigned if (bits & E_ORIGIN3) MSG_WriteCoord16i(msg, ent->origin[2]); } - else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5) + else if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) { // LordHavoc: have to write flags first, as they can modify protocol if (bits & E_FLAGS) @@ -413,7 +416,7 @@ void EntityState_WriteFields(const entity_state_t *ent, sizebuf_t *msg, unsigned MSG_WriteCoord32f(msg, ent->origin[2]); } } - if (sv.protocol == PROTOCOL_DARKPLACES5 && !(ent->flags & RENDER_LOWPRECISION)) + if ((sv.protocol == PROTOCOL_DARKPLACES5 || sv.protocol == PROTOCOL_DARKPLACES6) && !(ent->flags & RENDER_LOWPRECISION)) { if (bits & E_ANGLE1) MSG_WriteAngle16i(msg, ent->angles[0]); @@ -529,7 +532,7 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits) if (bits & E_ORIGIN3) e->origin[2] = MSG_ReadCoord16i(); } - else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5) + else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6) { if (bits & E_FLAGS) e->flags = MSG_ReadByte(); @@ -552,7 +555,9 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits) e->origin[2] = MSG_ReadCoord32f(); } } - if (cl.protocol == PROTOCOL_DARKPLACES5 && !(e->flags & RENDER_LOWPRECISION)) + else + Host_Error("EntityState_ReadFields: unknown cl.protocol %i\n", cl.protocol); + if ((cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6) && !(e->flags & RENDER_LOWPRECISION)) { if (bits & E_ANGLE1) e->angles[0] = MSG_ReadAngle16i(); @@ -650,10 +655,10 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits) Con_Printf(" E_GLOWSIZE %i", e->glowsize * 4); if (bits & E_GLOWCOLOR) Con_Printf(" E_GLOWCOLOR %i", e->glowcolor); - + if (bits & E_LIGHT) Con_Printf(" E_LIGHT %i:%i:%i:%i", e->light[0], e->light[1], e->light[2], e->light[3]); - if (bits & E_LIGHTPFLAGS) + if (bits & E_LIGHTPFLAGS) Con_Printf(" E_LIGHTPFLAGS %i", e->lightpflags); if (bits & E_TAGATTACHMENT) @@ -686,8 +691,7 @@ void EntityFrame_ClearDatabase(entityframe_database_t *d) void EntityFrame_AckFrame(entityframe_database_t *d, int frame) { int i; - if (d->ackframenum < frame) - d->ackframenum = frame; + d->ackframenum = frame; for (i = 0;i < d->numframes && d->frames[i].framenum < frame;i++); // ignore outdated frame acks (out of order packets) if (i == 0) @@ -805,7 +809,7 @@ void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numst EntityFrame_AddFrame(d, eye, d->latestframenum, numstates, states); - EntityFrame_FetchFrame(d, d->ackframenum > 0 ? d->ackframenum : -1, o); + EntityFrame_FetchFrame(d, d->ackframenum, o); MSG_WriteByte (msg, svc_entities); MSG_WriteLong (msg, o->framenum); @@ -856,7 +860,7 @@ void EntityFrame_CL_ReadFrame(void) entity_t *ent; entityframe_database_t *d; if (!cl.entitydatabase) - cl.entitydatabase = EntityFrame_AllocDatabase(cl_entities_mempool); + cl.entitydatabase = EntityFrame_AllocDatabase(cl_mempool); d = cl.entitydatabase; EntityFrame_Clear(f, NULL, -1); @@ -864,7 +868,9 @@ void EntityFrame_CL_ReadFrame(void) // read the frame header info f->time = cl.mtime[0]; number = MSG_ReadLong(); - cl.latestframenum = f->framenum = MSG_ReadLong(); + for (i = 0;i < LATESTFRAMENUMS-1;i++) + cl.latestframenums[i] = cl.latestframenums[i+1]; + cl.latestframenums[LATESTFRAMENUMS-1] = f->framenum = MSG_ReadLong(); f->eye[0] = MSG_ReadFloat(); f->eye[1] = MSG_ReadFloat(); f->eye[2] = MSG_ReadFloat(); @@ -916,6 +922,12 @@ void EntityFrame_CL_ReadFrame(void) *e = defaultstate; } + if (cl_num_entities <= number) + { + cl_num_entities = number + 1; + if (number >= cl_max_entities) + CL_ExpandEntities(number); + } cl_entities_active[number] = true; e->active = true; e->time = cl.mtime[0]; @@ -932,11 +944,11 @@ void EntityFrame_CL_ReadFrame(void) } EntityFrame_AddFrame(d, f->eye, f->framenum, f->numentities, f->entitydata); - memset(cl_entities_active, 0, cl_max_entities * sizeof(qbyte)); + memset(cl_entities_active, 0, cl_num_entities * sizeof(qbyte)); number = 1; for (i = 0;i < f->numentities;i++) { - for (;number < f->entitydata[i].number;number++) + for (;number < f->entitydata[i].number && number < cl_num_entities;number++) { if (cl_entities_active[number]) { @@ -944,6 +956,8 @@ void EntityFrame_CL_ReadFrame(void) cl_entities[number].state_current.active = false; } } + if (number >= cl_num_entities) + break; // update the entity ent = &cl_entities[number]; ent->state_previous = ent->state_current; @@ -953,7 +967,7 @@ void EntityFrame_CL_ReadFrame(void) cl_entities_active[number] = true; number++; } - for (;number < cl_max_entities;number++) + for (;number < cl_num_entities;number++) { if (cl_entities_active[number]) { @@ -1024,7 +1038,6 @@ entityframe4_database_t *EntityFrame4_AllocDatabase(mempool_t *pool) d = Mem_Alloc(pool, sizeof(*d)); d->mempool = pool; EntityFrame4_ResetDatabase(d); - d->ackframenum = -1; return d; } @@ -1042,7 +1055,6 @@ void EntityFrame4_FreeDatabase(entityframe4_database_t *d) void EntityFrame4_ResetDatabase(entityframe4_database_t *d) { int i; - d->ackframenum = -1; d->referenceframenum = -1; for (i = 0;i < MAX_ENTITY_HISTORY;i++) d->commit[i].numentities = 0; @@ -1118,12 +1130,14 @@ void EntityFrame4_CL_ReadFrame(void) entity_state_t *s; entityframe4_database_t *d; if (!cl.entitydatabase4) - cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_entities_mempool); + cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_mempool); d = cl.entitydatabase4; // read the number of the frame this refers to referenceframenum = MSG_ReadLong(); // read the number of this frame - cl.latestframenum = framenum = MSG_ReadLong(); + for (i = 0;i < LATESTFRAMENUMS-1;i++) + cl.latestframenums[i] = cl.latestframenums[i+1]; + cl.latestframenums[LATESTFRAMENUMS-1] = framenum = MSG_ReadLong(); // read the start number enumber = (unsigned short) MSG_ReadShort(); if (developer_networkentities.integer >= 1) @@ -1145,7 +1159,7 @@ void EntityFrame4_CL_ReadFrame(void) if (!d->commit[i].numentities) { d->currentcommit = d->commit + i; - d->currentcommit->framenum = d->ackframenum = framenum; + d->currentcommit->framenum = framenum; d->currentcommit->numentities = 0; } } @@ -1170,12 +1184,19 @@ void EntityFrame4_CL_ReadFrame(void) } // high bit means it's a remove message cnumber = n & 0x7FFF; + // if this is a live entity we may need to expand the array + if (cl_num_entities <= cnumber && !(n & 0x8000)) + { + cl_num_entities = cnumber + 1; + if (cnumber >= cl_max_entities) + CL_ExpandEntities(cnumber); + } // add one (the changed one) if not done stopnumber = cnumber + !done; // process entities in range from the last one to the changed one for (;enumber < stopnumber;enumber++) { - if (skip) + if (skip || enumber >= cl_num_entities) { if (enumber == cnumber && (n & 0x8000) == 0) { @@ -1352,6 +1373,10 @@ entityframe5_database_t *EntityFrame5_AllocDatabase(mempool_t *pool) void EntityFrame5_FreeDatabase(entityframe5_database_t *d) { + // all the [maxedicts] memory is allocated at once, so there's only one + // thing to free + if (d->maxedicts) + Mem_Free(d->deltabits); Mem_Free(d); } @@ -1360,11 +1385,40 @@ void EntityFrame5_ResetDatabase(entityframe5_database_t *d) int i; memset(d, 0, sizeof(*d)); d->latestframenum = 0; - d->ackframenum = -1; - for (i = 0;i < MAX_EDICTS;i++) + for (i = 0;i < d->maxedicts;i++) d->states[i] = defaultstate; } +void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax) +{ + if (d->maxedicts < newmax) + { + qbyte *data; + int oldmaxedicts = d->maxedicts; + int *olddeltabits = d->deltabits; + qbyte *oldpriorities = d->priorities; + int *oldupdateframenum = d->updateframenum; + entity_state_t *oldstates = d->states; + qbyte *oldvisiblebits = d->visiblebits; + d->maxedicts = newmax; + data = Mem_Alloc(sv_mempool, d->maxedicts * sizeof(int) + d->maxedicts * sizeof(qbyte) + d->maxedicts * sizeof(int) + d->maxedicts * sizeof(entity_state_t) + (d->maxedicts+7)/8 * sizeof(qbyte)); + d->deltabits = (void *)data;data += d->maxedicts * sizeof(int); + d->priorities = (void *)data;data += d->maxedicts * sizeof(qbyte); + d->updateframenum = (void *)data;data += d->maxedicts * sizeof(int); + d->states = (void *)data;data += d->maxedicts * sizeof(entity_state_t); + d->visiblebits = (void *)data;data += (d->maxedicts+7)/8 * sizeof(qbyte); + if (oldmaxedicts) + { + memcpy(d->deltabits, olddeltabits, d->maxedicts * sizeof(int)); + memcpy(d->priorities, oldpriorities, d->maxedicts * sizeof(qbyte)); + memcpy(d->updateframenum, oldupdateframenum, d->maxedicts * sizeof(int)); + memcpy(d->states, oldstates, d->maxedicts * sizeof(entity_state_t)); + memcpy(d->visiblebits, oldvisiblebits, (d->maxedicts+7)/8 * sizeof(qbyte)); + // the previous buffers were a single allocation, so just one free + Mem_Free(olddeltabits); + } + } +} int EntityState5_Priority(entityframe5_database_t *d, entity_state_t *view, entity_state_t *s, int changedbits, int age) { @@ -1525,6 +1579,12 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi MSG_WriteByte(msg, s->glowsize); MSG_WriteByte(msg, s->glowcolor); } + if (bits & E5_COLORMOD) + { + MSG_WriteByte(msg, s->colormod[0]); + MSG_WriteByte(msg, s->colormod[1]); + MSG_WriteByte(msg, s->colormod[2]); + } } } @@ -1568,15 +1628,15 @@ void EntityState5_ReadUpdate(entity_state_t *s) { if (bits & E5_ANGLES16) { - s->angles[0] = MSG_ReadAngle16i(); - s->angles[1] = MSG_ReadAngle16i(); - s->angles[2] = MSG_ReadAngle16i(); + s->angles[0] = MSG_ReadAngle16i(); + s->angles[1] = MSG_ReadAngle16i(); + s->angles[2] = MSG_ReadAngle16i(); } else { - s->angles[0] = MSG_ReadAngle8i(); - s->angles[1] = MSG_ReadAngle8i(); - s->angles[2] = MSG_ReadAngle8i(); + s->angles[0] = MSG_ReadAngle8i(); + s->angles[1] = MSG_ReadAngle8i(); + s->angles[2] = MSG_ReadAngle8i(); } } if (bits & E5_MODEL) @@ -1629,6 +1689,12 @@ void EntityState5_ReadUpdate(entity_state_t *s) s->glowsize = MSG_ReadByte(); s->glowcolor = MSG_ReadByte(); } + if (bits & E5_COLORMOD) + { + s->colormod[0] = MSG_ReadByte(); + s->colormod[1] = MSG_ReadByte(); + s->colormod[2] = MSG_ReadByte(); + } if (developer_networkentities.integer >= 2) @@ -1680,6 +1746,8 @@ void EntityState5_ReadUpdate(entity_state_t *s) Con_Printf(" E5_LIGHT %i:%i:%i:%i %i:%i", s->light[0], s->light[1], s->light[2], s->light[3], s->lightstyle, s->lightpflags); if (bits & E5_GLOW) Con_Printf(" E5_GLOW %i:%i", s->glowsize * 4, s->glowcolor); + if (bits & E5_COLORMOD) + Con_Printf(" E5_COLORMOD %f:%f:%f", s->colormod[0] / 32.0f, s->colormod[1] / 32.0f, s->colormod[2] / 32.0f); Con_Print("\n"); } } @@ -1717,6 +1785,8 @@ int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n) bits |= E5_LIGHT; if (o->glowsize != n->glowsize || o->glowcolor != n->glowcolor) bits |= E5_GLOW; + if (o->colormod[0] != n->colormod[0] || o->colormod[1] != n->colormod[1] || o->colormod[2] != n->colormod[2]) + bits |= E5_COLORMOD; } else if (o->active) @@ -1726,17 +1796,27 @@ int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n) void EntityFrame5_CL_ReadFrame(void) { - int n, enumber; + int i, n, enumber; entity_t *ent; entity_state_t *s; // read the number of this frame to echo back in next input packet - cl.latestframenum = MSG_ReadLong(); + for (i = 0;i < LATESTFRAMENUMS-1;i++) + cl.latestframenums[i] = cl.latestframenums[i+1]; + cl.latestframenums[LATESTFRAMENUMS-1] = MSG_ReadLong(); // read entity numbers until we find a 0x8000 // (which would be remove world entity, but is actually a terminator) while ((n = (unsigned short)MSG_ReadShort()) != 0x8000 && !msg_badread) { - // get the entity number and look it up + // get the entity number enumber = n & 0x7FFF; + // we may need to expand the array + if (cl_num_entities <= enumber) + { + cl_num_entities = enumber + 1; + if (enumber >= cl_max_entities) + CL_ExpandEntities(enumber); + } + // look up the entity ent = cl_entities + enumber; // slide the current into the previous slot ent->state_previous = ent->state_current; @@ -1772,26 +1852,16 @@ void EntityFrame5_CL_ReadFrame(void) } } -void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum, int viewentnum) +void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum, int viewentnum) { int i, j, k, l, bits; entityframe5_changestate_t *s, *s2; entityframe5_packetlog_t *p, *p2; - if (framenum <= d->ackframenum) - return; - d->ackframenum = framenum; - // scan for packets made obsolete by this ack + qbyte statsdeltabits[(MAX_CL_STATS+7)/8]; + // scan for packets that were lost for (i = 0, p = d->packetlog;i < ENTITYFRAME5_MAXPACKETLOGS;i++, p++) { - // skip packets that are empty or in the future - if (p->packetnumber == 0 || p->packetnumber > framenum) - continue; - // if the packetnumber matches it is deleted without any processing - // (since it was received). - // if the packet number is less than this ack it was lost and its - // important information will be repeated in this update if it is not - // already obsolete due to a later update. - if (p->packetnumber < framenum) + if (p->packetnumber && 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 @@ -1806,7 +1876,7 @@ void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum, int viewent { if (p2->packetnumber > framenum) { - for (l = 0, s2 = p2->states;l < p2->numstates;l++, p2++) + for (l = 0, s2 = p2->states;l < p2->numstates;l++, s2++) { if (s2->number == s->number) { @@ -1824,16 +1894,37 @@ void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum, int viewent d->priorities[s->number] = EntityState5_Priority(d, d->states + viewentnum, d->states + s->number, d->deltabits[s->number], d->latestframenum - d->updateframenum[s->number]); } } + // 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] & ~d->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++) + d->statsdeltabits[l] |= statsdeltabits[l]; + } + // delete this packet log as it is now obsolete + p->packetnumber = 0; } - // delete this packet log as it is now obsolete - p->packetnumber = 0; } } +void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum) +{ + int i; + // scan for packets made obsolete by this ack and delete them + for (i = 0;i < ENTITYFRAME5_MAXPACKETLOGS;i++) + if (d->packetlog[i].packetnumber <= framenum) + d->packetlog[i].packetnumber = 0; +} + int entityframe5_prioritychaincounts[E5_PROTOCOL_PRIORITYLEVELS]; unsigned short entityframe5_prioritychains[E5_PROTOCOL_PRIORITYLEVELS][ENTITYFRAME5_MAXSTATES]; -void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum) +void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int *stats) { const entity_state_t *n; int i, num, l, framenum, packetlognumber, priority; @@ -1841,13 +1932,37 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num qbyte data[128]; entityframe5_packetlog_t *packetlog; + if (sv.num_edicts > d->maxedicts) + EntityFrame5_ExpandEdicts(d, (sv.num_edicts + 255) & ~255); + framenum = d->latestframenum + 1; + // if packet log is full, mark all frames as lost, this will cause + // it to send the lost data again + for (packetlognumber = 0;packetlognumber < ENTITYFRAME5_MAXPACKETLOGS;packetlognumber++) + if (d->packetlog[packetlognumber].packetnumber == 0) + break; + if (packetlognumber == ENTITYFRAME5_MAXPACKETLOGS) + { + EntityFrame5_LostFrame(d, framenum, viewentnum); + packetlognumber = 0; + } + // prepare the buffer memset(&buf, 0, sizeof(buf)); buf.data = data; buf.maxsize = sizeof(data); + // detect changes in stats + for (i = 0;i < MAX_CL_STATS;i++) + { + if (d->stats[i] != stats[i]) + { + d->statsdeltabits[i>>3] |= (1<<(i&7)); + d->stats[i] = stats[i]; + } + } + // detect changes in states num = 0; for (i = 0, n = states;i < numstates;i++, n++) @@ -1881,7 +1996,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num num++; } // all remaining entities are dead - for (;num < MAX_EDICTS;num++) + for (;num < sv.num_edicts;num++) { if (CHECKPVSBIT(d->visiblebits, num)) { @@ -1896,7 +2011,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num // build lists of entities by priority level memset(entityframe5_prioritychaincounts, 0, sizeof(entityframe5_prioritychaincounts)); l = 0; - for (num = 0;num < MAX_EDICTS;num++) + for (num = 0;num < sv.num_edicts;num++) { if (d->priorities[num]) { @@ -1907,52 +2022,64 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num } } - // return early if there are no entities to send this time - if (l == 0) - return; - + // add packetlog entry + packetlog = d->packetlog + packetlognumber; + packetlog->packetnumber = framenum; + packetlog->numstates = 0; + // write stat updates + if (sv.protocol == PROTOCOL_DARKPLACES6) + { + for (i = 0;i < MAX_CL_STATS;i++) + { + if (d->statsdeltabits[i>>3] & (1<<(i&7))) + { + d->statsdeltabits[i>>3] &= ~(1<<(i&7)); + packetlog->statsdeltabits[i>>3] |= (1<<(i&7)); + if (d->stats[i] >= 0 && d->stats[i] < 256) + { + MSG_WriteByte(msg, svc_updatestatubyte); + MSG_WriteByte(msg, i); + MSG_WriteByte(msg, d->stats[i]); + } + else + { + MSG_WriteByte(msg, svc_updatestat); + MSG_WriteByte(msg, i); + MSG_WriteLong(msg, d->stats[i]); + } + } + } + } + // write state updates d->latestframenum = framenum; MSG_WriteByte(msg, svc_entities); MSG_WriteLong(msg, framenum); - - // if packet log is full, an empty update is still written - // (otherwise the client might have nothing to ack to remove packetlogs) - for (packetlognumber = 0, packetlog = d->packetlog;packetlognumber < ENTITYFRAME5_MAXPACKETLOGS;packetlognumber++, packetlog++) - if (packetlog->packetnumber == 0) - break; - if (packetlognumber < ENTITYFRAME5_MAXPACKETLOGS) + for (priority = E5_PROTOCOL_PRIORITYLEVELS - 1;priority >= 0 && packetlog->numstates < ENTITYFRAME5_MAXSTATES;priority--) { - // write to packet and log - packetlog->packetnumber = framenum; - packetlog->numstates = 0; - for (priority = E5_PROTOCOL_PRIORITYLEVELS - 1;priority >= 0 && packetlog->numstates < ENTITYFRAME5_MAXSTATES;priority--) + for (i = 0;i < entityframe5_prioritychaincounts[priority] && packetlog->numstates < ENTITYFRAME5_MAXSTATES;i++) { - for (i = 0;i < entityframe5_prioritychaincounts[priority] && packetlog->numstates < ENTITYFRAME5_MAXSTATES;i++) - { - num = entityframe5_prioritychains[priority][i]; - n = d->states + num; - if (d->deltabits[num] & E5_FULLUPDATE) - d->deltabits[num] = E5_FULLUPDATE | EntityState5_DeltaBits(&defaultstate, n); - buf.cursize = 0; - EntityState5_WriteUpdate(num, n, d->deltabits[num], &buf); - // if the entity won't fit, try the next one - if (msg->cursize + buf.cursize + 2 > msg->maxsize) - continue; - // write entity to the packet - SZ_Write(msg, buf.data, buf.cursize); - // mark age on entity for prioritization - d->updateframenum[num] = framenum; - // log entity so deltabits can be restored later if lost - packetlog->states[packetlog->numstates].number = num; - packetlog->states[packetlog->numstates].bits = d->deltabits[num]; - packetlog->numstates++; - // clear deltabits and priority so it won't be sent again - d->deltabits[num] = 0; - d->priorities[num] = 0; - } + num = entityframe5_prioritychains[priority][i]; + n = d->states + num; + if (d->deltabits[num] & E5_FULLUPDATE) + d->deltabits[num] = E5_FULLUPDATE | EntityState5_DeltaBits(&defaultstate, n); + buf.cursize = 0; + EntityState5_WriteUpdate(num, n, d->deltabits[num], &buf); + // if the entity won't fit, try the next one + if (msg->cursize + buf.cursize + 2 > msg->maxsize) + continue; + // write entity to the packet + SZ_Write(msg, buf.data, buf.cursize); + // mark age on entity for prioritization + d->updateframenum[num] = framenum; + // log entity so deltabits can be restored later if lost + packetlog->states[packetlog->numstates].number = num; + packetlog->states[packetlog->numstates].bits = d->deltabits[num]; + packetlog->numstates++; + // clear deltabits and priority so it won't be sent again + d->deltabits[num] = 0; + d->priorities[num] = 0; } } - MSG_WriteShort(msg, 0x8000); }