X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=848ad7c7f2357bdab1682b6e501e413c6fdef396;hb=5cf485940428b401e658f4351f65d1da08f93d36;hp=2b5c8197ecd44cb3069097a9ec81d9e5f35696e1;hpb=5c00b1379d819146fb18968fd9b5fa84bf4a770a;p=xonotic%2Fdarkplaces.git diff --git a/protocol.c b/protocol.c index 2b5c8197..848ad7c7 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 = { @@ -13,15 +11,9 @@ entity_state_t defaultstate = {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 modelindex; 0,//unsigned short frame; 0,//unsigned short tagentity; - 0,//unsigned short specialvisibilityradius; // ! larger if it has effects/light - 0,//unsigned short viewmodelforclient; // ! - 0,//unsigned short exteriormodelforclient; // ! not shown if first person viewing from this entity, shown in all other cases - 0,//unsigned short nodrawtoclient; // ! - 0,//unsigned short drawonlytoclient; // ! {0,0,0,0},//unsigned short light[4]; // color*256 (0.00 to 255.996), and radius*1 0,//unsigned char active; // true if a valid state 0,//unsigned char lightstyle; @@ -33,10 +25,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//unsigned char unused; // ! }; // LordHavoc: I own protocol ranges 96, 97, 3500-3599 @@ -63,17 +56,6 @@ protocolversioninfo[] = {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; @@ -250,29 +232,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. @@ -289,17 +248,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 @@ -307,13 +265,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) { @@ -327,7 +285,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]) @@ -342,7 +300,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; @@ -360,7 +318,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 @@ -374,7 +332,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 @@ -391,16 +349,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); @@ -409,14 +364,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) @@ -1108,7 +1062,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; @@ -1176,13 +1130,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); @@ -1461,7 +1417,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++) @@ -1613,7 +1569,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++) @@ -1743,7 +1699,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 @@ -1753,7 +1709,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,7 +1733,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) @@ -1794,7 +1750,7 @@ 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 || s->origin[0] >= 4096 || s->origin[1] < -4096 || s->origin[1] >= 4096 || s->origin[2] < -4096 || s->origin[2] >= 4096)) bits |= E5_ORIGIN32; if ((bits & E5_ANGLES) && !(s->flags & RENDER_LOWPRECISION)) bits |= E5_ANGLES16; @@ -1804,9 +1760,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) @@ -1914,7 +1870,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(); @@ -2025,7 +1981,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]); @@ -2131,7 +2087,7 @@ 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) cls.servermovesequence = MSG_ReadLong(); @@ -2162,7 +2118,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; @@ -2342,18 +2298,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)) - 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->deltabits[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; + } + else + d->priorities[num] = 0; } } @@ -2386,18 +2347,18 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num } } // 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); @@ -2423,43 +2384,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) @@ -2483,6 +2444,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); @@ -2535,7 +2497,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 @@ -2587,8 +2549,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]); @@ -2614,7 +2574,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)