X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=protocol.c;h=f57ff66ae255b02a7ea87eb32520ae697e9115d3;hb=c3ea7019c9ce6dd91e6f40a027a45cd27da17385;hp=abfdf9f3aee2fff4c8bf32c0da37decd95a66521;hpb=17e77d1763e4b47bf448e492ebab13abfb4168eb;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index abfdf9f3..f57ff66a 100644 --- a/protocol.c +++ b/protocol.c @@ -1,7 +1,21 @@ - #include "quakedef.h" -#define E5_PROTOCOL_PRIORITYLEVELS 32 +#define ENTITYSIZEPROFILING_START(msg, num) \ + int entityprofiling_startsize = msg->cursize + +#define ENTITYSIZEPROFILING_END(msg, num) \ + 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); \ + } // this is 88 bytes (must match entity_state_t in protocol.h) entity_state_t defaultstate = @@ -11,9 +25,9 @@ entity_state_t defaultstate = {0,0,0},//float netcenter[3]; // ! for network prioritization, this is the center of the bounding box (which may differ from the origin) {0,0,0},//float origin[3]; {0,0,0},//float angles[3]; - 0,//int number; // entity number this state is for 0,//int effects; 0,//unsigned int customizeentityforclient; // ! + 0,//unsigned short number; // entity number this state is for 0,//unsigned short modelindex; 0,//unsigned short frame; 0,//unsigned short tagentity; @@ -33,10 +47,11 @@ entity_state_t defaultstate = 0,//unsigned char glowsize; 254,//unsigned char glowcolor; 0,//unsigned char flags; + 0,//unsigned char internaleffects; // INTEF_FLAG1QW and so on 0,//unsigned char tagindex; {32, 32, 32},//unsigned char colormod[3]; // padding to a multiple of 8 bytes (to align the double time) - {0,0}//unsigned char unused[2]; // ! + {0,0,0,0,0}//unsigned char unused[5]; // ! }; // LordHavoc: I own protocol ranges 96, 97, 3500-3599 @@ -59,21 +74,13 @@ protocolversioninfo[] = {15, "QUAKEDP"}, {250, "NEHAHRAMOVIE"}, {15, "QUAKE"}, - {28, "QUAKEWORLD"}, + {28, "QW"}, + {10000, "NEHAHRABJP"}, + {10001, "NEHAHRABJP2"}, + {10002, "NEHAHRABJP3"}, {0, NULL} }; -static mempool_t *sv2csqc = NULL; -int csqc_clientnum = 0; -sizebuf_t *sv2csqcbuf = NULL; -static unsigned char *sv2csqcents_version[MAX_SCOREBOARD]; - -static entity_frame_t deltaframe; // FIXME? -static entity_frame_t framedata; // FIXME? - -int entityframe5_prioritychaincounts[E5_PROTOCOL_PRIORITYLEVELS]; -unsigned short entityframe5_prioritychains[E5_PROTOCOL_PRIORITYLEVELS][ENTITYFRAME5_MAXSTATES]; - protocolversion_t Protocol_EnumForName(const char *s) { int i; @@ -111,8 +118,8 @@ void Protocol_Names(char *buffer, size_t buffersize) for (i = 1;protocolversioninfo[i].name;i++) { if (i > 1) - strlcat(buffer, " ", sizeof(buffer)); - strlcat(buffer, protocolversioninfo[i].name, sizeof(buffer)); + strlcat(buffer, " ", buffersize); + strlcat(buffer, protocolversioninfo[i].name, buffersize); } } @@ -167,7 +174,13 @@ void EntityFrameQuake_ReadEntity(int bits) s.number = num; s.time = cl.mtime[0]; s.flags = 0; - if (bits & U_MODEL) s.modelindex = (s.modelindex & 0xFF00) | MSG_ReadByte(); + if (bits & U_MODEL) + { + if (cls.protocol == PROTOCOL_NEHAHRABJP || cls.protocol == PROTOCOL_NEHAHRABJP2 || cls.protocol == PROTOCOL_NEHAHRABJP3) + s.modelindex = (unsigned short) MSG_ReadShort(); + else + s.modelindex = (s.modelindex & 0xFF00) | MSG_ReadByte(); + } if (bits & U_FRAME) s.frame = (s.frame & 0xFF00) | MSG_ReadByte(); if (bits & U_COLORMAP) s.colormap = MSG_ReadByte(); if (bits & U_SKIN) s.skin = MSG_ReadByte(); @@ -250,173 +263,342 @@ void EntityFrameQuake_ISeeDeadEntities(void) } } -void EntityFrameCSQC_ClearVersions (void) +// NOTE: this only works with DP5 protocol and upwards. For lower protocols +// (including QUAKE), no packet loss handling for CSQC is done, which makes +// CSQC basically useless. +// Always use the DP5 protocol, or a higher one, when using CSQC entities. +static void EntityFrameCSQC_LostAllFrames(client_t *client) { - if(sv2csqc) - { - Mem_FreePool(&sv2csqc); - sv2csqc = NULL; - } - memset(sv2csqcents_version, 0, MAX_SCOREBOARD*sizeof(unsigned char *)); -} + // 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; -void EntityFrameCSQC_InitClientVersions (int client, qboolean clear) -{ - if(!sv2csqc) - sv2csqc = Mem_AllocPool("SV2CSQC", 0, NULL); - if(sv2csqcents_version[client]) + if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0) + return; + + n = client->csqcnumedicts; + for(i = 0; i < n; ++i) { - Mem_Free(sv2csqcents_version[client]); - sv2csqcents_version[client] = NULL; + if(client->csqcentityglobalhistory[i]) + { + ed = prog->edicts + i; + val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); + if (val->function) + client->csqcentitysendflags[i] |= 0xFFFFFF; // FULL RESEND + else // if it was ever sent to that client as a CSQC entity + { + client->csqcentityscope[i] = 1; // REMOVE + client->csqcentitysendflags[i] |= 0xFFFFFF; + } + } } - sv2csqcents_version[client] = (unsigned char *)Mem_Alloc(sv2csqc, MAX_EDICTS); - memset(sv2csqcents_version[client], 0, MAX_EDICTS); } +void EntityFrameCSQC_LostFrame(client_t *client, int framenum) +{ + // marks a frame as lost + int i, j, n; + qboolean valid; + int ringfirst, ringlast; + int recoversendflags[MAX_EDICTS]; + csqcentityframedb_t *d; -// FIXME FIXME FIXME: at this time the CSQC entity writing does not store -// packet logs and thus if an update is lost it is never repeated, this makes -// csqc entities useless at the moment. + n = client->csqcnumedicts; -void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, qboolean *sectionstarted) -{ - int version; - prvm_eval_t *val, *val2; - version = 0; - if (doupdate) + // is our frame out of history? + ringfirst = client->csqcentityframehistory_next; // oldest entry + ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry + + valid = false; + + for(j = 0; j < NUM_CSQCENTITYDB_FRAMES; ++j) + { + d = &client->csqcentityframehistory[(ringfirst + j) % NUM_CSQCENTITYDB_FRAMES]; + if(d->framenum < 0) + continue; + if(d->framenum == framenum) + break; + else if(d->framenum < framenum) + valid = true; + } + if(j == NUM_CSQCENTITYDB_FRAMES) { - if (msg->cursize + !*sectionstarted + 2 + 1 + 2 > msg->maxsize) + if(valid) // got beaten, i.e. there is a frame < framenum + { + // a non-csqc frame got lost... great return; - val2 = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.Version); - version = (int)val2->_float; - // LordHavoc: do some validity checks on self.Version - // if Version reaches 8388608, it has already exhausted half of the - // reliable integer space in a 32bit float, and should be reset to 1 - // FIXME: we should set all client versions of this entity to -1 - // so that it will not be skipped accidentally in some cases after - // the reset - if (version < 0) - val2->_float = 0; - if (version >= 8388608) - { - int i; - val2->_float = 1; - // since we just reset the Version field to 1, it may accidentally - // end up being equal to an existing client version now or in the - // future, so to fix this situation we have to loop over all - // clients and change their versions for this entity to be -1 - // which never matches, thus causing them to receive the update - // soon, as they should - for (i = 0;i < svs.maxclients;i++) - if (sv2csqcents_version[i] && sv2csqcents_version[i][number]) - sv2csqcents_version[i][number] = -1; - } - } - // if the version already matches, we don't need to do anything as the - // latest version has already been sent. - if (sv2csqcents_version[csqc_clientnum][number] == version) + } + else + { + // a too old frame got lost... sorry, cannot handle this + Con_DPrintf("CSQC entity DB: lost a frame too early to do any handling (resending ALL)...\n"); + 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); + } return; - if (version) + } + + // so j is the frame that got lost + // ringlast is the frame that we have to go to + ringfirst = (ringfirst + j) % NUM_CSQCENTITYDB_FRAMES; + if(ringlast < ringfirst) + ringlast += NUM_CSQCENTITYDB_FRAMES; + + memset(recoversendflags, 0, sizeof(recoversendflags)); + + for(j = ringfirst; j <= ringlast; ++j) { - // if there's no SendEntity function, treat it as a remove - val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity); - if (val->function) + d = &client->csqcentityframehistory[j % NUM_CSQCENTITYDB_FRAMES]; + if(d->framenum < 0) { - // there is a function to call, save the cursize value incase we - // have to do a rollback due to overflow - int oldcursize = msg->cursize; - if(!*sectionstarted) - MSG_WriteByte(msg, svc_csqcentities); - MSG_WriteShort(msg, number); - ((int *)prog->globals.generic)[OFS_PARM0] = csqc_clientnum+1; - prog->globals.server->self = number; - PRVM_ExecuteProgram(val->function, "Null SendEntity\n"); - if(prog->globals.generic[OFS_RETURN]) + // deleted frame + } + else if(d->framenum < framenum) + { + // a frame in the past... should never happen + Con_Printf("CSQC entity DB encountered a frame from the past when recovering from PL...?\n"); + } + else if(d->framenum == framenum) + { + // handling the actually lost frame now + for(i = 0; i < d->num; ++i) { - if (msg->cursize + 2 > msg->maxsize) - { - // if the packet no longer has enough room to write the - // final index code that ends the message, rollback to the - // state before we tried to write anything and then return - msg->cursize = oldcursize; - msg->overflowed = false; - return; - } - // an update has been successfully written, update the version - sv2csqcents_version[csqc_clientnum][number] = version; - // and take note that we have begun the svc_csqcentities - // section of the packet - *sectionstarted = 1; - return; + int sf = d->sendflags[i]; + int ent = d->entno[i]; + if(sf < 0) // remove + recoversendflags[ent] |= -1; // all bits, including sign + else if(sf > 0) + recoversendflags[ent] |= sf; } - else + } + else + { + // handling the frames that followed it now + for(i = 0; i < d->num; ++i) { - // rollback the buffer to its state before the writes - msg->cursize = oldcursize; - // if the function returned FALSE, simply write a remove - // this is done by falling through to the remove code below - version = 0; + int sf = d->sendflags[i]; + int ent = d->entno[i]; + if(sf < 0) // remove + { + recoversendflags[ent] = 0; // no need to update, we got a more recent remove (and will fix it THEN) + break; // no flags left to remove... + } + else if(sf > 0) + recoversendflags[ent] &= ~sf; // no need to update these bits, we already got them later } } } - // write a remove message if needed - // if already removed, do nothing - if (!sv2csqcents_version[csqc_clientnum][number]) - return; - // if there isn't enough room to write the remove message, just return, as - // it will be handled in a later packet - if (msg->cursize + !*sectionstarted + 2 + 2 > msg->maxsize) - return; - // first write the message identifier if needed - if(!*sectionstarted) + + for(i = 0; i < client->csqcnumedicts; ++i) + { + if(recoversendflags[i] < 0) + { + // a remove got lost, then either send a remove or - if it was + // recreated later - a FULL update to make totally sure + client->csqcentityscope[i] = 1; + client->csqcentitysendflags[i] = 0xFFFFFF; + } + else + client->csqcentitysendflags[i] |= recoversendflags[i]; + } +} +static int EntityFrameCSQC_AllocFrame(client_t *client, int framenum) +{ + int ringfirst = client->csqcentityframehistory_next; // oldest entry + client->csqcentityframehistory_next += 1; + client->csqcentityframehistory_next %= NUM_CSQCENTITYDB_FRAMES; + client->csqcentityframehistory[ringfirst].framenum = framenum; + client->csqcentityframehistory[ringfirst].num = 0; + return ringfirst; +} +static void EntityFrameCSQC_DeallocFrame(client_t *client, int framenum) +{ + int ringfirst = client->csqcentityframehistory_next; // oldest entry + int ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry + if(framenum == client->csqcentityframehistory[ringlast].framenum) { - *sectionstarted = 1; - MSG_WriteByte(msg, svc_csqcentities); + client->csqcentityframehistory[ringlast].framenum = -1; + client->csqcentityframehistory[ringlast].num = 0; + client->csqcentityframehistory_next = ringlast; } - // write the remove message - MSG_WriteShort(msg, (unsigned short)number | 0x8000); - sv2csqcents_version[csqc_clientnum][number] = 0; + else + Con_Printf("Trying to dealloc the wrong entity frame\n"); } //[515]: we use only one array per-client for SendEntity feature -void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states) +// TODO: add some handling for entity send priorities, to better deal with huge +// amounts of csqc networked entities +qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states, int framenum) { - int i, num; + int num, number, end, sendflags; qboolean sectionstarted = false; const entity_state_t *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 this server progs is not CSQC-aware, return early if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0) - return; + return false; + // make sure there is enough room to store the svc_csqcentities byte, // the terminator (0x0000) and at least one entity update - if (msg->cursize + 32 >= msg->maxsize) - return; - if(!sv2csqcents_version[csqc_clientnum]) - EntityFrameCSQC_InitClientVersions(csqc_clientnum, false); + if (msg->cursize + 32 >= maxsize) + return false; - sv2csqcbuf = msg; - num = 1; + if (client->csqcnumedicts < prog->num_edicts) + client->csqcnumedicts = prog->num_edicts; + + number = 1; + for (num = 0, n = states;num < numstates;num++, n++) + { + end = n->number; + for (;number < end;number++) + { + if (client->csqcentityscope[number]) + { + client->csqcentityscope[number] = 1; + client->csqcentitysendflags[number] = 0xFFFFFF; + } + } + ed = prog->edicts + number; + val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); + if (val->function) + client->csqcentityscope[number] = 2; + else if (client->csqcentityscope[number]) + { + client->csqcentityscope[number] = 1; + client->csqcentitysendflags[number] = 0xFFFFFF; + } + number++; + } + end = client->csqcnumedicts; + for (;number < end;number++) + { + if (client->csqcentityscope[number]) + { + client->csqcentityscope[number] = 1; + client->csqcentitysendflags[number] = 0xFFFFFF; + } + } + + /* + // mark all scope entities as remove + for (number = 1;number < client->csqcnumedicts;number++) + if (client->csqcentityscope[number]) + client->csqcentityscope[number] = 1; + // keep visible entities for (i = 0, n = states;i < numstates;i++, n++) { - // all entities between the previous entity state and this one are dead - for (;num < n->number;num++) - if(sv2csqcents_version[csqc_clientnum][num]) - EntityFrameCSQC_WriteState(msg, num, false, §ionstarted); - // update this entity - EntityFrameCSQC_WriteState(msg, num, true, §ionstarted); - // advance to next entity so the next iteration doesn't immediately remove it - num++; + number = n->number; + ed = prog->edicts + number; + val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); + if (val->function) + client->csqcentityscope[number] = 2; + } + */ + + // now try to emit the entity updates + // (FIXME: prioritize by distance?) + end = client->csqcnumedicts; + for (number = 1;number < end;number++) + { + if (!client->csqcentityscope[number]) + continue; + sendflags = client->csqcentitysendflags[number]; + if (!sendflags) + continue; + if(db->num >= NUM_CSQCENTITIES_PER_FRAME) + break; + ed = prog->edicts + number; + // entity scope is either update (2) or remove (1) + if (client->csqcentityscope[number] == 1) + { + // write a remove message + // first write the message identifier if needed + if(!sectionstarted) + { + sectionstarted = 1; + MSG_WriteByte(msg, svc_csqcentities); + } + // write the remove message + { + ENTITYSIZEPROFILING_START(msg, number); + MSG_WriteShort(msg, (unsigned short)number | 0x8000); + client->csqcentityscope[number] = 0; + client->csqcentitysendflags[number] = 0xFFFFFF; // resend completely if it becomes active again + db->entno[db->num] = number; + db->sendflags[db->num] = -1; + db->num += 1; + client->csqcentityglobalhistory[number] = 1; + ENTITYSIZEPROFILING_END(msg, number); + } + if (msg->cursize + 17 >= maxsize) + break; + } + else + { + // write an update + // 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(!sectionstarted) + MSG_WriteByte(msg, svc_csqcentities); + { + ENTITYSIZEPROFILING_START(msg, number); + MSG_WriteShort(msg, number); + msg->allowoverflow = true; + 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"); + msg->allowoverflow = false; + if(PRVM_G_FLOAT(OFS_RETURN) && msg->cursize + 2 <= maxsize) + { + // an update has been successfully written + client->csqcentitysendflags[number] = 0; + db->entno[db->num] = number; + db->sendflags[db->num] = sendflags; + db->num += 1; + client->csqcentityglobalhistory[number] = 1; + // and take note that we have begun the svc_csqcentities + // section of the packet + sectionstarted = 1; + ENTITYSIZEPROFILING_END(msg, number); + if (msg->cursize + 17 >= maxsize) + break; + continue; + } + } + } + // self.SendEntity returned false (or does not exist) or the + // update was too big for this packet - rollback the buffer to its + // state before the writes occurred, we'll try again next frame + msg->cursize = oldcursize; + msg->overflowed = false; + } } - // all remaining entities are dead - for (;num < prog->num_edicts;num++) - if(sv2csqcents_version[csqc_clientnum][num]) - EntityFrameCSQC_WriteState(msg, num, false, §ionstarted); if (sectionstarted) { // write index 0 to end the update (0 is never used by real entities) MSG_WriteShort(msg, 0); } - sv2csqcbuf = NULL; + + if(db->num == 0) + // if no single ent got added, remove the frame from the DB again, to allow + // for a larger history + EntityFrameCSQC_DeallocFrame(client, framenum); + + return sectionstarted; } void Protocol_UpdateClientStats(const int *stats) @@ -433,33 +615,62 @@ void Protocol_UpdateClientStats(const int *stats) } } +// only a few stats are within the 32 stat limit of Quake, and most of them +// are sent every frame in svc_clientdata messages, so we only send the +// remaining ones here +static const int sendquakestats[] = +{ +// quake did not send these secrets/monsters stats in this way, but doing so +// allows a mod to increase STAT_TOTALMONSTERS during the game, and ensures +// that STAT_SECRETS and STAT_MONSTERS are always correct (even if a client +// didn't receive an svc_foundsecret or svc_killedmonster), which may be most +// valuable if randomly seeking around in a demo +STAT_TOTALSECRETS, // never changes during game +STAT_TOTALMONSTERS, // changes in some mods +STAT_SECRETS, // this makes svc_foundsecret unnecessary +STAT_MONSTERS, // this makes svc_killedmonster unnecessary +STAT_VIEWHEIGHT, // sent just for FTEQW clients +STAT_VIEWZOOM, // this rarely changes +-1, +}; + void Protocol_WriteStatsReliable(void) { - int i; + int i, j; if (!host_client->netconnection) return; // detect changes in stats and write reliable messages - for (i = 0;i < MAX_CL_STATS;i++) + // this only deals with 32 stats because the older protocols which use + // this function can only cope with 32 stats, + // they also do not support svc_updatestatubyte which was introduced in + // DP6 protocol (except for QW) + for (j = 0;sendquakestats[j] >= 0;j++) { - // quickly skip zero bytes - if (!host_client->statsdeltabits[i >> 3]) - { - i |= 7; - continue; - } + i = sendquakestats[j]; // check if this bit is set if (host_client->statsdeltabits[i >> 3] & (1 << (i & 7))) { host_client->statsdeltabits[i >> 3] -= (1 << (i & 7)); // send the stat as a byte if possible - if (host_client->stats[i] >= 0 && host_client->stats[i] < 256) + if (sv.protocol == PROTOCOL_QUAKEWORLD) { - MSG_WriteByte(&host_client->netconnection->message, svc_updatestatubyte); - MSG_WriteByte(&host_client->netconnection->message, i); - MSG_WriteByte(&host_client->netconnection->message, host_client->stats[i]); + if (host_client->stats[i] >= 0 && host_client->stats[i] < 256) + { + MSG_WriteByte(&host_client->netconnection->message, qw_svc_updatestat); + MSG_WriteByte(&host_client->netconnection->message, i); + MSG_WriteByte(&host_client->netconnection->message, host_client->stats[i]); + } + else + { + MSG_WriteByte(&host_client->netconnection->message, qw_svc_updatestatlong); + MSG_WriteByte(&host_client->netconnection->message, i); + MSG_WriteLong(&host_client->netconnection->message, host_client->stats[i]); + } } else { + // this could make use of svc_updatestatubyte in DP6 and later + // protocols but those protocols do not use this function MSG_WriteByte(&host_client->netconnection->message, svc_updatestat); MSG_WriteByte(&host_client->netconnection->message, i); MSG_WriteLong(&host_client->netconnection->message, host_client->stats[i]); @@ -469,7 +680,7 @@ void Protocol_WriteStatsReliable(void) } -void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_state_t *states) +void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states) { const entity_state_t *s; entity_state_t baseline; @@ -485,6 +696,7 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta for (i = 0, s = states;i < numstates;i++, s++) { + ENTITYSIZEPROFILING_START(msg, s->number); val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); if(val && val->function) continue; @@ -538,7 +750,7 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta if (baseline.modelindex != s->modelindex) { bits |= U_MODEL; - if (s->modelindex & 0xFF00) + if ((s->modelindex & 0xFF00) && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3) bits |= U_MODEL2; } if (baseline.alpha != s->alpha) @@ -549,6 +761,8 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta bits |= U_GLOWSIZE; if (baseline.glowcolor != s->glowcolor) bits |= U_GLOWCOLOR; + if (!VectorCompare(baseline.colormod, s->colormod)) + bits |= U_COLORMOD; // if extensions are disabled, clear the relevant update flags if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_NEHAHRAMOVIE) @@ -568,12 +782,21 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta MSG_WriteByte (&buf, bits); if (bits & U_MOREBITS) MSG_WriteByte(&buf, bits>>8); - if (bits & U_EXTEND1) MSG_WriteByte(&buf, bits>>16); - if (bits & U_EXTEND2) MSG_WriteByte(&buf, bits>>24); + if (sv.protocol != PROTOCOL_NEHAHRAMOVIE) + { + if (bits & U_EXTEND1) MSG_WriteByte(&buf, bits>>16); + if (bits & U_EXTEND2) MSG_WriteByte(&buf, bits>>24); + } if (bits & U_LONGENTITY) MSG_WriteShort(&buf, s->number); else MSG_WriteByte(&buf, s->number); - if (bits & U_MODEL) MSG_WriteByte(&buf, s->modelindex); + if (bits & U_MODEL) + { + if (sv.protocol == PROTOCOL_NEHAHRABJP || sv.protocol == PROTOCOL_NEHAHRABJP2 || sv.protocol == PROTOCOL_NEHAHRABJP3) + MSG_WriteShort(&buf, s->modelindex); + else + MSG_WriteByte(&buf, s->modelindex); + } if (bits & U_FRAME) MSG_WriteByte(&buf, s->frame); if (bits & U_COLORMAP) MSG_WriteByte(&buf, s->colormap); if (bits & U_SKIN) MSG_WriteByte(&buf, s->skin); @@ -610,13 +833,14 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta } // if the commit is full, we're done this frame - if (msg->cursize + buf.cursize > msg->maxsize) + if (msg->cursize + buf.cursize > maxsize) { // next frame we will continue where we left off break; } // write the message to the packet SZ_Write(msg, buf.data, buf.cursize); + ENTITYSIZEPROFILING_END(msg, s->number); } } @@ -802,6 +1026,7 @@ void EntityState_WriteFields(const entity_state_t *ent, sizebuf_t *msg, unsigned void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const entity_state_t *delta) { unsigned int bits; + ENTITYSIZEPROFILING_START(msg, ent->number); if (ent->active) { // entity is active, check for changes from the delta @@ -822,6 +1047,7 @@ void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const en MSG_WriteShort(msg, ent->number | 0x8000); } } + ENTITYSIZEPROFILING_END(msg, ent->number); } int EntityState_ReadExtendBits(void) @@ -1105,10 +1331,10 @@ void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, i } // (server) writes a frame to network stream -void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum) +void EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum) { int i, onum, number; - entity_frame_t *o = &deltaframe; + entity_frame_t *o = &d->deltaframe; const entity_state_t *ent, *delta; vec3_t eye; prvm_eval_t *val; @@ -1176,13 +1402,15 @@ void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numst void EntityFrame_CL_ReadFrame(void) { int i, number, removed; - entity_frame_t *f = &framedata, *delta = &deltaframe; + entity_frame_t *f, *delta; entity_state_t *e, *old, *oldend; entity_t *ent; entityframe_database_t *d; if (!cl.entitydatabase) cl.entitydatabase = EntityFrame_AllocDatabase(cls.levelmempool); d = cl.entitydatabase; + f = &d->framedata; + delta = &d->deltaframe; EntityFrame_Clear(f, NULL, -1); @@ -1579,7 +1807,7 @@ void EntityFrame4_CL_ReadFrame(void) EntityFrame4_ResetDatabase(d); } -void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int numstates, const entity_state_t *states) +void EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t *states) { const entity_state_t *e, *s; entity_state_t inactiveentitystate; @@ -1589,7 +1817,7 @@ void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int num prvm_eval_t *val; // if there isn't enough space to accomplish anything, skip it - if (msg->cursize + 24 > msg->maxsize) + if (msg->cursize + 24 > maxsize) return; // prepare the buffer @@ -1659,7 +1887,7 @@ void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int num } } // if the commit is full, we're done this frame - if (msg->cursize + buf.cursize > msg->maxsize - 4) + if (msg->cursize + buf.cursize > maxsize - 4) { // next frame we will continue where we left off break; @@ -1706,7 +1934,7 @@ void EntityFrame5_FreeDatabase(entityframe5_database_t *d) Mem_Free(d); } -void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax) +static void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax) { if (d->maxedicts < newmax) { @@ -1737,13 +1965,13 @@ void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax) } } -int EntityState5_Priority(entityframe5_database_t *d, int stateindex) +static int EntityState5_Priority(entityframe5_database_t *d, int stateindex) { int limit, priority; entity_state_t *s; // if it is the player, update urgently if (stateindex == d->viewentnum) - return E5_PROTOCOL_PRIORITYLEVELS - 1; + return ENTITYFRAME5_PRIORITYLEVELS - 1; // priority increases each frame no matter what happens priority = d->priorities[stateindex] + 1; // players get an extra priority boost @@ -1753,7 +1981,7 @@ int EntityState5_Priority(entityframe5_database_t *d, int stateindex) if (!d->states[stateindex].active) { priority++; - return bound(1, priority, E5_PROTOCOL_PRIORITYLEVELS - 1); + return bound(1, priority, ENTITYFRAME5_PRIORITYLEVELS - 1); } // certain changes are more noticable than others if (d->deltabits[stateindex] & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_FLAGS | E5_COLORMAP)) @@ -1777,12 +2005,13 @@ int EntityState5_Priority(entityframe5_database_t *d, int stateindex) // distance from the player if (VectorDistance(d->states[d->viewentnum].netcenter, s->netcenter) < 1024.0f) priority++; - return bound(1, priority, E5_PROTOCOL_PRIORITYLEVELS - 1); + return bound(1, priority, ENTITYFRAME5_PRIORITYLEVELS - 1); } void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg) { unsigned int bits = 0; + ENTITYSIZEPROFILING_START(msg, s->number); prvm_eval_t *val; val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); @@ -1794,8 +2023,17 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi else { bits = changedbits; - if ((bits & E5_ORIGIN) && ((s->flags & RENDER_EXTERIORMODEL) || s->origin[0] < -4096 || s->origin[0] >= 4096 || s->origin[1] < -4096 || s->origin[1] >= 4096 || s->origin[2] < -4096 || s->origin[2] >= 4096)) + if ((bits & E5_ORIGIN) && ((s->flags & RENDER_EXTERIORMODEL) || s->origin[0] <= -4096.0625 || s->origin[0] >= 4095.9375 || s->origin[1] <= -4096.0625 || s->origin[1] >= 4095.9375 || s->origin[2] <= -4096.0625 || s->origin[2] >= 4095.9375)) bits |= E5_ORIGIN32; + // possible values: + // negative origin: + // (int)(f * 8 - 0.5) >= -32768 + // (f * 8 - 0.5) > -32769 + // f > -4096.0625 + // positive origin: + // (int)(f * 8 + 0.5) <= 32767 + // (f * 8 + 0.5) < 32768 + // f * 8 + 0.5) < 4095.9375 if ((bits & E5_ANGLES) && !(s->flags & RENDER_LOWPRECISION)) bits |= E5_ANGLES16; if ((bits & E5_MODEL) && s->modelindex >= 256) @@ -1804,9 +2042,9 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi bits |= E5_FRAME16; if (bits & E5_EFFECTS) { - if (s->effects >= 65536) + if (s->effects & 0xFFFF0000) bits |= E5_EFFECTS32; - else if (s->effects >= 256) + else if (s->effects & 0xFFFFFF00) bits |= E5_EFFECTS16; } if (bits >= 256) @@ -1912,9 +2150,11 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi MSG_WriteByte(msg, s->colormod[2]); } } + + ENTITYSIZEPROFILING_END(msg, s->number); } -void EntityState5_ReadUpdate(entity_state_t *s, int number) +static void EntityState5_ReadUpdate(entity_state_t *s, int number) { int bits; bits = MSG_ReadByte(); @@ -2080,7 +2320,7 @@ void EntityState5_ReadUpdate(entity_state_t *s, int number) } } -int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n) +static int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n) { unsigned int bits = 0; if (n->active) @@ -2224,7 +2464,7 @@ void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum) { 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)) + 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); @@ -2257,7 +2497,7 @@ void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum) d->packetlog[i].packetnumber = 0; } -void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence) +void EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence, qboolean need_empty) { const entity_state_t *n; int i, num, l, framenum, packetlognumber, priority; @@ -2342,7 +2582,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num return; // build lists of entities by priority level - memset(entityframe5_prioritychaincounts, 0, sizeof(entityframe5_prioritychaincounts)); + memset(d->prioritychaincounts, 0, sizeof(d->prioritychaincounts)); l = 0; for (num = 0;num < d->maxedicts;num++) { @@ -2350,12 +2590,12 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num { if (d->deltabits[num]) { - if (d->priorities[num] < (E5_PROTOCOL_PRIORITYLEVELS - 1)) + if (d->priorities[num] < (ENTITYFRAME5_PRIORITYLEVELS - 1)) d->priorities[num] = EntityState5_Priority(d, num); l = num; priority = d->priorities[num]; - if (entityframe5_prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES) - entityframe5_prioritychains[priority][entityframe5_prioritychaincounts[priority]++] = num; + if (d->prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES) + d->prioritychains[priority][d->prioritychaincounts[priority]++] = num; } else d->priorities[num] = 0; @@ -2367,9 +2607,9 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num packetlog->packetnumber = framenum; packetlog->numstates = 0; // write stat updates - if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5) + if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5) { - for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= msg->maxsize;i++) + for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= maxsize;i++) { if (host_client->statsdeltabits[i>>3] & (1<<(i&7))) { @@ -2380,16 +2620,23 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num MSG_WriteByte(msg, svc_updatestatubyte); MSG_WriteByte(msg, i); MSG_WriteByte(msg, host_client->stats[i]); + l = 1; } else { MSG_WriteByte(msg, svc_updatestat); MSG_WriteByte(msg, i); MSG_WriteLong(msg, host_client->stats[i]); + l = 1; } } } } + + // only send empty svc_entities frame if needed + if(!l && !need_empty) + return; + // write state updates if (developer_networkentities.integer >= 10) Con_Printf("send: svc_entities %i\n", framenum); @@ -2398,18 +2645,18 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num MSG_WriteLong(msg, framenum); if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5 && sv.protocol != PROTOCOL_DARKPLACES6) MSG_WriteLong(msg, movesequence); - for (priority = E5_PROTOCOL_PRIORITYLEVELS - 1;priority >= 0 && packetlog->numstates < ENTITYFRAME5_MAXSTATES;priority--) + for (priority = ENTITYFRAME5_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 < d->prioritychaincounts[priority] && packetlog->numstates < ENTITYFRAME5_MAXSTATES;i++) { - num = entityframe5_prioritychains[priority][i]; + num = d->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) + if (msg->cursize + buf.cursize + 2 > maxsize) continue; // write entity to the packet SZ_Write(msg, buf.data, buf.cursize); @@ -2428,43 +2675,43 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num } -static int QW_TranslateEffects(int qweffects, int number) +static void QW_TranslateEffects(entity_state_t *s, int qweffects) { - int effects = 0; + s->effects = 0; + s->internaleffects = 0; if (qweffects & QW_EF_BRIGHTFIELD) - effects |= EF_BRIGHTFIELD; + s->effects |= EF_BRIGHTFIELD; if (qweffects & QW_EF_MUZZLEFLASH) - effects |= EF_MUZZLEFLASH; + s->effects |= EF_MUZZLEFLASH; if (qweffects & QW_EF_FLAG1) { // mimic FTEQW's interpretation of EF_FLAG1 as EF_NODRAW on non-player entities - if (number > cl.maxclients) - effects |= EF_NODRAW; + if (s->number > cl.maxclients) + s->effects |= EF_NODRAW; else - effects |= EF_FLAG1QW; + s->internaleffects |= INTEF_FLAG1QW; } if (qweffects & QW_EF_FLAG2) { // mimic FTEQW's interpretation of EF_FLAG2 as EF_ADDITIVE on non-player entities - if (number > cl.maxclients) - effects |= EF_ADDITIVE; + if (s->number > cl.maxclients) + s->effects |= EF_ADDITIVE; else - effects |= EF_FLAG2QW; + s->internaleffects |= INTEF_FLAG2QW; } if (qweffects & QW_EF_RED) { if (qweffects & QW_EF_BLUE) - effects |= EF_RED | EF_BLUE; + s->effects |= EF_RED | EF_BLUE; else - effects |= EF_RED; + s->effects |= EF_RED; } else if (qweffects & QW_EF_BLUE) - effects |= EF_BLUE; + s->effects |= EF_BLUE; else if (qweffects & QW_EF_BRIGHTLIGHT) - effects |= EF_BRIGHTLIGHT; + s->effects |= EF_BRIGHTLIGHT; else if (qweffects & QW_EF_DIMLIGHT) - effects |= EF_DIMLIGHT; - return effects; + s->effects |= EF_DIMLIGHT; } void EntityStateQW_ReadPlayerUpdate(void) @@ -2488,6 +2735,7 @@ void EntityStateQW_ReadPlayerUpdate(void) s = &ent->state_current; *s = defaultstate; s->active = true; + s->number = enumber; s->colormap = enumber; playerflags = MSG_ReadShort(); MSG_ReadVector(s->origin, cls.protocol); @@ -2540,7 +2788,7 @@ void EntityStateQW_ReadPlayerUpdate(void) if (playerflags & QW_PF_SKINNUM) s->skin = MSG_ReadByte(); if (playerflags & QW_PF_EFFECTS) - s->effects = QW_TranslateEffects(MSG_ReadByte(), enumber); + QW_TranslateEffects(s, MSG_ReadByte()); if (playerflags & QW_PF_WEAPONFRAME) weaponframe = MSG_ReadByte(); else @@ -2592,8 +2840,6 @@ void EntityStateQW_ReadPlayerUpdate(void) cl.entities_active[enumber] = s->active; // set the update time s->time = cl.mtime[0] - msec * 0.001; // qw has no clock - // fix the number (it gets wiped occasionally by copying from defaultstate) - s->number = enumber; // check if we need to update the lerp stuff if (s->active) CL_MoveLerpEntityStates(&cl.entities[enumber]); @@ -2619,7 +2865,7 @@ static void EntityStateQW_ReadEntityUpdate(entity_state_t *s, int bits) if (bits & QW_U_SKIN) s->skin = MSG_ReadByte(); if (bits & QW_U_EFFECTS) - s->effects = QW_TranslateEffects(qweffects = MSG_ReadByte(), s->number); + QW_TranslateEffects(s, qweffects = MSG_ReadByte()); if (bits & QW_U_ORIGIN1) s->origin[0] = MSG_ReadCoord13i(); if (bits & QW_U_ANGLE1)