X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=66b4db3ad6fc37603e183c5f7148c93e2cb5f57c;hb=1d8da66c6d6e2f48017b9020125538d3bfa74814;hp=92f5d637a0252227e00eab94aeec4d4c5453a6d3;hpb=8659703a56a752a24a84b9208a38055512ce2736;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index 92f5d637..66b4db3a 100644 --- a/protocol.c +++ b/protocol.c @@ -1,18 +1,17 @@ #include "quakedef.h" -#define E5_PROTOCOL_PRIORITYLEVELS 32 - // this is 88 bytes (must match entity_state_t in protocol.h) entity_state_t defaultstate = { // ! means this is not sent to client 0,//double time; // ! time this state was built (used on client for interpolation) + {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; @@ -32,10 +31,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,0,0,0,0}//unsigned char unused[6]; // ! + {0,0,0,0,0}//unsigned char unused[5]; // ! }; // LordHavoc: I own protocol ranges 96, 97, 3500-3599 @@ -58,21 +58,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_clent = 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; @@ -110,8 +102,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); } } @@ -166,7 +158,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(); @@ -249,133 +247,233 @@ void EntityFrameQuake_ISeeDeadEntities(void) } } -void EntityFrameCSQC_ClearVersions (void) +// 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. + +//[515]: we use only one array per-client for SendEntity feature +void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states) { - if(sv2csqc) + 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; + + // if this server progs is not CSQC-aware, return early + if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0) + return; + + // 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 >= maxsize) + return; + + if (client->csqcnumedicts < prog->num_edicts) + client->csqcnumedicts = prog->num_edicts; + + number = 1; + for (num = 0, n = states;num < numstates;num++, n++) { - Mem_FreePool(&sv2csqc); - sv2csqc = NULL; + 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++; } - memset(sv2csqcents_version, 0, MAX_SCOREBOARD*sizeof(unsigned char *)); -} - -void EntityFrameCSQC_InitClientVersions (int client, qboolean clear) -{ - if(!sv2csqc) - sv2csqc = Mem_AllocPool("SV2CSQC", 0, NULL); - if(sv2csqcents_version[client]) + end = client->csqcnumedicts; + for (;number < end;number++) { - Mem_Free(sv2csqcents_version[client]); - sv2csqcents_version[client] = NULL; + if (client->csqcentityscope[number]) + { + client->csqcentityscope[number] = 1; + client->csqcentitysendflags[number] = 0xFFFFFF; + } } - sv2csqcents_version[client] = (unsigned char *)Mem_Alloc(sv2csqc, MAX_EDICTS); - memset(sv2csqcents_version[client], 0, MAX_EDICTS); -} -//[515]: we use only one array per-client for SendEntity feature -void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states) -{ - sizebuf_t buf; - unsigned char data[2048]; - const entity_state_t *s; - unsigned short i, t, t2, t0; - prvm_eval_t *val, *val2; - int csqcents = 0; - - if(!eval_SendEntity || !eval_Version) - return; - --csqc_clent; - if(!sv2csqcents_version[csqc_clent]) - EntityFrameCSQC_InitClientVersions(csqc_clent, false); + /* + // 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++) + { + number = n->number; + ed = prog->edicts + number; + val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); + if (val->function) + client->csqcentityscope[number] = 2; + } + */ - for (csqcents = i = 0, s = states;i < numstates;i++, s++) + // now try to emit the entity updates + // (FIXME: prioritize by distance?) + end = client->csqcnumedicts; + for (number = 1;number < end;number++) { - //[515]: entities remove - if(i+1 >= numstates) - t2 = prog->num_edicts; - else - t2 = states[i+1].number; - if(!i) + if (!client->csqcentityscope[number]) + continue; + sendflags = client->csqcentitysendflags[number]; + if (!sendflags) + continue; + ed = prog->edicts + number; + // entity scope is either update (2) or remove (1) + if (client->csqcentityscope[number] == 1) { - t0 = 1; - t2 = s->number; + // write a remove message + // first write the message identifier if needed + if(!sectionstarted) + { + sectionstarted = 1; + MSG_WriteByte(msg, svc_csqcentities); + } + // write the remove message + MSG_WriteShort(msg, (unsigned short)number | 0x8000); + client->csqcentityscope[number] = 0; + client->csqcentitysendflags[number] = 0; + if (msg->cursize + 17 >= maxsize) + break; } else - t0 = s->number+1; - for(t=t0; tcursize; + client->csqcentityscope[number] = 1; + val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity); + if (val->function) { - if(!csqcents) + if(!sectionstarted) + MSG_WriteByte(msg, svc_csqcentities); + 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) { - csqcents = 1; - memset(&buf, 0, sizeof(buf)); - buf.data = data; - buf.maxsize = sizeof(data); - sv2csqcbuf = &buf; - SZ_Clear(&buf); - MSG_WriteByte(&buf, svc_csqcentities); + // an update has been successfully written + client->csqcentitysendflags[number] = 0; + // and take note that we have begun the svc_csqcentities + // section of the packet + sectionstarted = 1; + if (msg->cursize + 17 >= maxsize) + break; + continue; } - sv2csqcents_version[csqc_clent][t] = 0; - MSG_WriteShort(&buf, (unsigned short)t | 0x8000); - csqcents++; } - //[515]: entities remove + // 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; + } + } + if (sectionstarted) + { + // write index 0 to end the update (0 is never used by real entities) + MSG_WriteShort(msg, 0); + } +} -// if(!s->active) -// continue; - val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), eval_SendEntity); - if(val->function) +void Protocol_UpdateClientStats(const int *stats) +{ + int i; + // update the stats array and set deltabits for any changed stats + for (i = 0;i < MAX_CL_STATS;i++) + { + if (host_client->stats[i] != stats[i]) { - val2 = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), eval_Version); - if(sv2csqcents_version[csqc_clent][s->number] == (unsigned char)val2->_float) - continue; - if(!csqcents) - { - csqcents = 1; - memset(&buf, 0, sizeof(buf)); - buf.data = data; - buf.maxsize = sizeof(data); - sv2csqcbuf = &buf; - SZ_Clear(&buf); - MSG_WriteByte(&buf, svc_csqcentities); - } - if((unsigned char)val2->_float == 0) - val2->_float = 1; - MSG_WriteShort(&buf, s->number); - ((int *)prog->globals.generic)[OFS_PARM0] = csqc_clent+1; - prog->globals.server->self = s->number; - PRVM_ExecuteProgram(val->function, "Null SendEntity\n"); - if(!prog->globals.generic[OFS_RETURN]) + host_client->statsdeltabits[i >> 3] |= 1 << (i & 7); + host_client->stats[i] = stats[i]; + } + } +} + +// 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, j; + if (!host_client->netconnection) + return; + // detect changes in stats and write reliable messages + // 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++) + { + 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 (sv.protocol == PROTOCOL_QUAKEWORLD) { - buf.cursize -= 2; - if(sv2csqcents_version[csqc_clent][s->number]) + if (host_client->stats[i] >= 0 && host_client->stats[i] < 256) { - sv2csqcents_version[csqc_clent][s->number] = 0; - MSG_WriteShort(&buf, (unsigned short)s->number | 0x8000); - csqcents++; + 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 { - sv2csqcents_version[csqc_clent][s->number] = (unsigned char)val2->_float; - csqcents++; + // 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]); } - if (msg->cursize + buf.cursize > msg->maxsize) - break; - } - } - if(csqcents) - { - if(csqcents > 1) - { - MSG_WriteShort(&buf, 0); - SZ_Write(msg, buf.data, buf.cursize); } - sv2csqcbuf = NULL; } } -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; @@ -391,7 +489,7 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta for (i = 0, s = states;i < numstates;i++, s++) { - val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), eval_SendEntity); + val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); if(val && val->function) continue; @@ -444,7 +542,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) @@ -455,6 +553,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) @@ -474,12 +574,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); @@ -516,7 +625,7 @@ 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; @@ -1011,10 +1120,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; @@ -1048,7 +1157,7 @@ void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numst ent = states + i; number = ent->number; - val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[number]), eval_SendEntity); + val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity); if(val && val->function) continue; for (;onum < o->numentities && o->entitydata[onum].number < number;onum++) @@ -1082,13 +1191,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); @@ -1367,7 +1478,7 @@ void EntityFrame4_CL_ReadFrame(void) cl.latestframenums[LATESTFRAMENUMS-1] = framenum = MSG_ReadLong(); // read the start number enumber = (unsigned short) MSG_ReadShort(); - if (developer_networkentities.integer >= 1) + if (developer_networkentities.integer >= 10) { Con_Printf("recv svc_entities num:%i ref:%i database: ref:%i commits:", framenum, referenceframenum, d->referenceframenum); for (i = 0;i < MAX_ENTITY_HISTORY;i++) @@ -1485,7 +1596,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; @@ -1495,7 +1606,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 @@ -1519,7 +1630,7 @@ void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int num MSG_WriteByte(msg, svc_entities); MSG_WriteLong(msg, d->referenceframenum); MSG_WriteLong(msg, d->currentcommit->framenum); - if (developer_networkentities.integer >= 1) + if (developer_networkentities.integer >= 10) { Con_Printf("send svc_entities num:%i ref:%i (database: ref:%i commits:", d->currentcommit->framenum, d->referenceframenum, d->referenceframenum); for (i = 0;i < MAX_ENTITY_HISTORY;i++) @@ -1537,7 +1648,7 @@ void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int num d->currententitynumber = 1; for (i = 0, n = startnumber;n < prog->max_edicts;n++) { - val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[n]), eval_SendEntity); + val = PRVM_EDICTFIELDVALUE((&prog->edicts[n]), prog->fieldoffsets.SendEntity); if(val && val->function) continue; // find the old state to delta from @@ -1565,7 +1676,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; @@ -1645,49 +1756,45 @@ void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax) int EntityState5_Priority(entityframe5_database_t *d, int stateindex) { - int lowprecision, limit, priority; - double distance; - int changedbits; - entity_state_t *view, *s; - changedbits = d->deltabits[stateindex]; - priority = d->priorities[stateindex]; + int limit, priority; + entity_state_t *s; + // if it is the player, update urgently + if (stateindex == d->viewentnum) + return ENTITYFRAME5_PRIORITYLEVELS - 1; + // priority increases each frame no matter what happens + priority = d->priorities[stateindex] + 1; + // players get an extra priority boost + if (stateindex <= svs.maxclients) + priority++; // remove dead entities very quickly because they are just 2 bytes if (!d->states[stateindex].active) - return E5_PROTOCOL_PRIORITYLEVELS - 1; - // check whole attachment chain to judge relevance to player - view = d->states + d->viewentnum; - lowprecision = false; + { + priority++; + 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)) + priority++; + // find the root entity this one is attached to, and judge relevance by it for (limit = 0;limit < 256;limit++) { - if (d->maxedicts < stateindex) - EntityFrame5_ExpandEdicts(d, (stateindex+256)&~255); s = d->states + stateindex; - // if it is the player, update urgently - if (s == view) - return E5_PROTOCOL_PRIORITYLEVELS - 1; - // if it is one of the player's viewmodels, update urgently if (s->flags & RENDER_VIEWMODEL) - return E5_PROTOCOL_PRIORITYLEVELS - 1; - if (s->flags & RENDER_LOWPRECISION) - lowprecision = true; - if (!s->tagentity) + stateindex = d->viewentnum; + else if (s->tagentity) + stateindex = s->tagentity; + else break; - stateindex = s->tagentity; + if (d->maxedicts < stateindex) + EntityFrame5_ExpandEdicts(d, (stateindex+256)&~255); } if (limit >= 256) Con_DPrintf("Protocol: Runaway loop recursing tagentity links on entity %i\n", stateindex); // now that we have the parent entity we can make some decisions based on - // distance and other factors - // TODO: add velocity check for things moving toward you (+1 priority) - distance = VectorDistance(view->origin, s->origin); - // if it is not far from the player, update more often - if (distance < 1024.0f && !lowprecision) + // distance from the player + if (VectorDistance(d->states[d->viewentnum].netcenter, s->netcenter) < 1024.0f) priority++; - if (changedbits & E5_FULLUPDATE) - priority++; - if (changedbits & (E5_ATTACHMENT | E5_MODEL | E5_FLAGS | E5_COLORMAP)) - priority++; - return (int) 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) @@ -1695,7 +1802,7 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi unsigned int bits = 0; prvm_eval_t *val; - val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), eval_SendEntity); + val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); if(val && val->function) return; @@ -1704,8 +1811,17 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi else { bits = changedbits; - if ((bits & E5_ORIGIN) && (!(s->flags & RENDER_LOWPRECISION) || 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) @@ -1714,9 +1830,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) @@ -1824,7 +1940,7 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi } } -void EntityState5_ReadUpdate(entity_state_t *s) +void EntityState5_ReadUpdate(entity_state_t *s, int number) { int bits; bits = MSG_ReadByte(); @@ -1935,7 +2051,7 @@ void EntityState5_ReadUpdate(entity_state_t *s) if (developer_networkentities.integer >= 2) { - Con_Printf("ReadFields e%i", s->number); + Con_Printf("ReadFields e%i", number); if (bits & E5_ORIGIN) Con_Printf(" E5_ORIGIN %f %f %f", s->origin[0], s->origin[1], s->origin[2]); @@ -1968,6 +2084,8 @@ void EntityState5_ReadUpdate(entity_state_t *s) Con_Print(" SHADOW"); if (s->flags & RENDER_LIGHT) Con_Print(" LIGHT"); + if (s->flags & RENDER_NOSELFSHADOW) + Con_Print(" NOSELFSHADOW"); Con_Print(")"); } if (bits & E5_ALPHA) @@ -2039,10 +2157,10 @@ void EntityFrame5_CL_ReadFrame(void) for (i = 0;i < LATESTFRAMENUMS-1;i++) cl.latestframenums[i] = cl.latestframenums[i+1]; cl.latestframenums[LATESTFRAMENUMS-1] = MSG_ReadLong(); - if (developer_networkentities.integer) + if (developer_networkentities.integer >= 10) Con_Printf("recv: svc_entities %i\n", cl.latestframenums[LATESTFRAMENUMS-1]); if (cls.protocol != PROTOCOL_QUAKE && cls.protocol != PROTOCOL_QUAKEDP && cls.protocol != PROTOCOL_NEHAHRAMOVIE && cls.protocol != PROTOCOL_DARKPLACES1 && cls.protocol != PROTOCOL_DARKPLACES2 && cls.protocol != PROTOCOL_DARKPLACES3 && cls.protocol != PROTOCOL_DARKPLACES4 && cls.protocol != PROTOCOL_DARKPLACES5 && cls.protocol != PROTOCOL_DARKPLACES6) - cl.servermovesequence = MSG_ReadLong(); + cls.servermovesequence = 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) @@ -2070,7 +2188,7 @@ void EntityFrame5_CL_ReadFrame(void) else { // update entity - EntityState5_ReadUpdate(s); + EntityState5_ReadUpdate(s, enumber); } // set the cl.entities_active flag cl.entities_active[enumber] = s->active; @@ -2131,20 +2249,24 @@ void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum) if (bits) { d->deltabits[s->number] |= bits; - d->priorities[s->number] = 1; + // 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] & ~d->statsdeltabits[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++) - d->statsdeltabits[l] |= statsdeltabits[l]; + host_client->statsdeltabits[l] |= statsdeltabits[l]; } // delete this packet log as it is now obsolete p->packetnumber = 0; @@ -2161,7 +2283,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 *stats, 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) { const entity_state_t *n; int i, num, l, framenum, packetlognumber, priority; @@ -2192,18 +2314,8 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num 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; + num = 1; for (i = 0, n = states;i < numstates;i++, n++) { // mark gaps in entity numbering as removed entities @@ -2214,7 +2326,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num { CLEARPVSBIT(d->visiblebits, num); d->deltabits[num] = E5_FULLUPDATE; - d->priorities[num] = E5_PROTOCOL_PRIORITYLEVELS - 1; + d->priorities[num] = max(d->priorities[num], 8); // removal is cheap d->states[num] = defaultstate; d->states[num].number = num; } @@ -2225,10 +2337,13 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num // entity just spawned in, don't let it completely hog priority // because of being ancient on the first frame d->updateframenum[num] = framenum; + // initial priority is a bit high to make projectiles send on the + // first frame, among other things + d->priorities[num] = max(d->priorities[num], 4); } SETPVSBIT(d->visiblebits, num); d->deltabits[num] |= EntityState5_DeltaBits(d->states + num, n); - d->priorities[num] = 1; + d->priorities[num] = max(d->priorities[num], 1); d->states[num] = *n; d->states[num].number = num; // advance to next entity so the next iteration doesn't immediately remove it @@ -2241,7 +2356,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num { CLEARPVSBIT(d->visiblebits, num); d->deltabits[num] = E5_FULLUPDATE; - d->priorities[num] = E5_PROTOCOL_PRIORITYLEVELS - 1; + d->priorities[num] = max(d->priorities[num], 8); // removal is cheap d->states[num] = defaultstate; d->states[num].number = num; } @@ -2253,21 +2368,23 @@ 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++) { if (d->priorities[num]) { - if (d->priorities[num] < (E5_PROTOCOL_PRIORITYLEVELS - 1)) + if (d->deltabits[num]) { - d->priorities[num]++; - d->priorities[num] = EntityState5_Priority(d, num); + if (d->priorities[num] < (ENTITYFRAME5_PRIORITYLEVELS - 1)) + d->priorities[num] = EntityState5_Priority(d, num); + l = num; + priority = d->priorities[num]; + if (d->prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES) + d->prioritychains[priority][d->prioritychaincounts[priority]++] = num; } - l = num; - priority = d->priorities[num]; - if (entityframe5_prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES) - entityframe5_prioritychains[priority][entityframe5_prioritychaincounts[priority]++] = num; + else + d->priorities[num] = 0; } } @@ -2276,49 +2393,49 @@ 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 (d->statsdeltabits[i>>3] & (1<<(i&7))) + if (host_client->statsdeltabits[i>>3] & (1<<(i&7))) { - d->statsdeltabits[i>>3] &= ~(1<<(i&7)); + host_client->statsdeltabits[i>>3] &= ~(1<<(i&7)); packetlog->statsdeltabits[i>>3] |= (1<<(i&7)); - if (d->stats[i] >= 0 && d->stats[i] < 256) + if (host_client->stats[i] >= 0 && host_client->stats[i] < 256) { MSG_WriteByte(msg, svc_updatestatubyte); MSG_WriteByte(msg, i); - MSG_WriteByte(msg, d->stats[i]); + MSG_WriteByte(msg, host_client->stats[i]); } else { MSG_WriteByte(msg, svc_updatestat); MSG_WriteByte(msg, i); - MSG_WriteLong(msg, d->stats[i]); + MSG_WriteLong(msg, host_client->stats[i]); } } } } // write state updates - if (developer_networkentities.integer) + if (developer_networkentities.integer >= 10) Con_Printf("send: svc_entities %i\n", framenum); d->latestframenum = framenum; MSG_WriteByte(msg, svc_entities); 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); @@ -2337,43 +2454,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) @@ -2397,6 +2514,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); @@ -2449,7 +2567,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 @@ -2501,8 +2619,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]); @@ -2528,7 +2644,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)