X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=71cfa159190fb5aaccae78facd2e2b79df351137;hb=be511c50c3e4e5fa25e56fb957690072d51314c5;hp=aa40970e1e18b8cf76f58693562ccc73c3adf3c7;hpb=397530aecdd5492236e3dc5620ee7126078c07f3;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index aa40970e..71cfa159 100644 --- a/protocol.c +++ b/protocol.c @@ -1,8 +1,6 @@ #include "quakedef.h" -#define E5_PROTOCOL_PRIORITYLEVELS 32 - // this is 88 bytes (must match entity_state_t in protocol.h) entity_state_t defaultstate = { @@ -11,9 +9,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,11 +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]; - 0,//unsigned char internaleffects; // INTEF_FLAG1QW and so on // padding to a multiple of 8 bytes (to align the double time) - 0//unsigned char unused; // ! + {0,0,0,0,0}//unsigned char unused[5]; // ! }; // LordHavoc: I own protocol ranges 96, 97, 3500-3599 @@ -60,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_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; @@ -112,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); } } @@ -168,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(); @@ -251,29 +247,6 @@ void EntityFrameQuake_ISeeDeadEntities(void) } } -void EntityFrameCSQC_ClearVersions (void) -{ - if(sv2csqc) - { - Mem_FreePool(&sv2csqc); - sv2csqc = NULL; - } - 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]) - { - Mem_Free(sv2csqcents_version[client]); - sv2csqcents_version[client] = NULL; - } - sv2csqcents_version[client] = (unsigned char *)Mem_Alloc(sv2csqc, MAX_EDICTS); - memset(sv2csqcents_version[client], 0, MAX_EDICTS); -} - // 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. @@ -290,17 +263,16 @@ void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, 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 self.Version reaches 255, it will soon exceed the byte used to + // store an entity version in the client struct, so we need to reset + // all the version to 1 and force all the existing clients' version of + // it to 255 (which we're not allowing to actually occur) if (version < 0) val2->_float = 0; - if (version >= 8388608) + if (version >= 255) { int i; - val2->_float = 1; + val2->_float = version = 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 @@ -308,13 +280,13 @@ void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, // 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 (svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number]) + svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = 255; } } // 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) + if (svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] == version) return; if (version) { @@ -328,7 +300,7 @@ void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, if(!*sectionstarted) MSG_WriteByte(msg, svc_csqcentities); MSG_WriteShort(msg, number); - ((int *)prog->globals.generic)[OFS_PARM0] = csqc_clientnum+1; + ((int *)prog->globals.generic)[OFS_PARM0] = sv.writeentitiestoclient_cliententitynumber; prog->globals.server->self = number; PRVM_ExecuteProgram(val->function, "Null SendEntity\n"); if(prog->globals.generic[OFS_RETURN]) @@ -343,7 +315,7 @@ void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, return; } // an update has been successfully written, update the version - sv2csqcents_version[csqc_clientnum][number] = version; + svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = version; // and take note that we have begun the svc_csqcentities // section of the packet *sectionstarted = 1; @@ -361,7 +333,7 @@ void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, } // write a remove message if needed // if already removed, do nothing - if (!sv2csqcents_version[csqc_clientnum][number]) + if (!svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number]) return; // if there isn't enough room to write the remove message, just return, as // it will be handled in a later packet @@ -375,7 +347,7 @@ void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, } // write the remove message MSG_WriteShort(msg, (unsigned short)number | 0x8000); - sv2csqcents_version[csqc_clientnum][number] = 0; + svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = 0; } //[515]: we use only one array per-client for SendEntity feature @@ -392,16 +364,13 @@ void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_sta // 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); - sv2csqcbuf = msg; num = 1; 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]) + if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num]) EntityFrameCSQC_WriteState(msg, num, false, §ionstarted); // update this entity EntityFrameCSQC_WriteState(msg, num, true, §ionstarted); @@ -410,14 +379,13 @@ void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_sta } // all remaining entities are dead for (;num < prog->num_edicts;num++) - if(sv2csqcents_version[csqc_clientnum][num]) + if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[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; } void Protocol_UpdateClientStats(const int *stats) @@ -434,33 +402,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]); @@ -539,7 +536,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) @@ -550,6 +547,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) @@ -569,12 +568,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); @@ -1109,7 +1117,7 @@ void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, i void EntityFrame_WriteFrame(sizebuf_t *msg, 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; @@ -1177,13 +1185,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); @@ -1744,7 +1754,7 @@ int EntityState5_Priority(entityframe5_database_t *d, int stateindex) 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 @@ -1754,7 +1764,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)) @@ -1778,7 +1788,7 @@ 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) @@ -2225,7 +2235,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); @@ -2343,7 +2353,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++) { @@ -2351,12 +2361,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; @@ -2368,7 +2378,7 @@ 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++) { @@ -2399,11 +2409,11 @@ 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);