X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=protocol.c;h=ec69774fd897ece7faae8c8deb901ed0c86d28f8;hp=acd5999a237a8ebca8246c41214a7b429690bc52;hb=246dd4cf0465a184e17f09f9bb7449004ccae4f4;hpb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2 diff --git a/protocol.c b/protocol.c index acd5999a..ec69774f 100644 --- a/protocol.c +++ b/protocol.c @@ -51,8 +51,6 @@ entity_state_t defaultstate = 0,//unsigned char tagindex; {32, 32, 32},//unsigned char colormod[3]; {32, 32, 32},//unsigned char glowmod[3]; - // padding to a multiple of 8 bytes (to align the double time) - {0,0}//unsigned char unused[2]; // ! }; // LordHavoc: I own protocol ranges 96, 97, 3500-3599 @@ -302,7 +300,7 @@ void EntityFrameCSQC_LostFrame(client_t *client, int framenum) int i, j, n; qboolean valid; int ringfirst, ringlast; - int recoversendflags[MAX_EDICTS]; + static int recoversendflags[MAX_EDICTS]; csqcentityframedb_t *d; n = client->csqcnumedicts; @@ -681,7 +679,7 @@ void Protocol_WriteStatsReliable(void) } -qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states) +qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t **states) { const entity_state_t *s; entity_state_t baseline; @@ -696,9 +694,10 @@ qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, buf.data = data; buf.maxsize = sizeof(data); - for (i = 0, s = states;i < numstates;i++, s++) + for (i = 0;i < numstates;i++) { - ENTITYSIZEPROFILING_START(msg, s->number); + ENTITYSIZEPROFILING_START(msg, states[i]->number); + s = states[i]; val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity); if(val && val->function) continue; @@ -1217,6 +1216,8 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits) } } +extern void CL_NewFrameReceived(int num); + // (client and server) allocates a new empty database entityframe_database_t *EntityFrame_AllocDatabase(mempool_t *mempool) { @@ -1282,8 +1283,60 @@ void EntityFrame_FetchFrame(entityframe_database_t *d, int framenum, entity_fram } } -// (server and client) adds a entity_frame to the database, for future reference -void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata) +// (client) adds a entity_frame to the database, for future reference +void EntityFrame_AddFrame_Client(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata) +{ + int n, e; + entity_frameinfo_t *info; + + VectorCopy(eye, d->eye); + + // figure out how many entity slots are used already + if (d->numframes) + { + n = d->frames[d->numframes - 1].endentity - d->frames[0].firstentity; + if (n + numentities > MAX_ENTITY_DATABASE || d->numframes >= MAX_ENTITY_HISTORY) + { + // ran out of room, dump database + EntityFrame_ClearDatabase(d); + } + } + + info = &d->frames[d->numframes]; + info->framenum = framenum; + e = -1000; + // make sure we check the newly added frame as well, but we haven't incremented numframes yet + for (n = 0;n <= d->numframes;n++) + { + if (e >= d->frames[n].framenum) + { + if (e == framenum) + Con_Print("EntityFrame_AddFrame: tried to add out of sequence frame to database\n"); + else + Con_Print("EntityFrame_AddFrame: out of sequence frames in database\n"); + return; + } + e = d->frames[n].framenum; + } + // if database still has frames after that... + if (d->numframes) + info->firstentity = d->frames[d->numframes - 1].endentity; + else + info->firstentity = 0; + info->endentity = info->firstentity + numentities; + d->numframes++; + + n = info->firstentity % MAX_ENTITY_DATABASE; + e = MAX_ENTITY_DATABASE - n; + if (e > numentities) + e = numentities; + memcpy(d->entitydata + n, entitydata, sizeof(entity_state_t) * e); + if (numentities > e) + memcpy(d->entitydata, entitydata + e, sizeof(entity_state_t) * (numentities - e)); +} + +// (server) adds a entity_frame to the database, for future reference +void EntityFrame_AddFrame_Server(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t **entitydata) { int n, e; entity_frameinfo_t *info; @@ -1335,7 +1388,7 @@ void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, i } // (server) writes a frame to network stream -qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum) +qboolean 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 = &d->deltaframe; @@ -1348,14 +1401,15 @@ qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_databas VectorClear(eye); for (i = 0;i < numstates;i++) { - if (states[i].number == viewentnum) + ent = states[i]; + if (ent->number == viewentnum) { - VectorSet(eye, states[i].origin[0], states[i].origin[1], states[i].origin[2] + 22); + VectorSet(eye, ent->origin[0], ent->origin[1], ent->origin[2] + 22); break; } } - EntityFrame_AddFrame(d, eye, d->latestframenum, numstates, states); + EntityFrame_AddFrame_Server(d, eye, d->latestframenum, numstates, states); EntityFrame_FetchFrame(d, d->ackframenum, o); @@ -1369,7 +1423,7 @@ qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_databas onum = 0; for (i = 0;i < numstates;i++) { - ent = states + i; + ent = states[i]; number = ent->number; val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity); @@ -1423,9 +1477,8 @@ void EntityFrame_CL_ReadFrame(void) // read the frame header info f->time = cl.mtime[0]; number = MSG_ReadLong(); - for (i = 0;i < LATESTFRAMENUMS-1;i++) - cl.latestframenums[i] = cl.latestframenums[i+1]; - cl.latestframenums[LATESTFRAMENUMS-1] = f->framenum = MSG_ReadLong(); + f->framenum = MSG_ReadLong(); + CL_NewFrameReceived(f->framenum); f->eye[0] = MSG_ReadFloat(); f->eye[1] = MSG_ReadFloat(); f->eye[2] = MSG_ReadFloat(); @@ -1497,7 +1550,7 @@ void EntityFrame_CL_ReadFrame(void) f->entitydata[f->numentities] = *old++; f->entitydata[f->numentities++].time = cl.mtime[0]; } - EntityFrame_AddFrame(d, f->eye, f->framenum, f->numentities, f->entitydata); + EntityFrame_AddFrame_Client(d, f->eye, f->framenum, f->numentities, f->entitydata); memset(cl.entities_active, 0, cl.num_entities * sizeof(unsigned char)); number = 1; @@ -1690,9 +1743,8 @@ void EntityFrame4_CL_ReadFrame(void) // read the number of the frame this refers to referenceframenum = MSG_ReadLong(); // read the number of this frame - for (i = 0;i < LATESTFRAMENUMS-1;i++) - cl.latestframenums[i] = cl.latestframenums[i+1]; - cl.latestframenums[LATESTFRAMENUMS-1] = framenum = MSG_ReadLong(); + framenum = MSG_ReadLong(); + CL_NewFrameReceived(framenum); // read the start number enumber = (unsigned short) MSG_ReadShort(); if (developer_networkentities.integer >= 10) @@ -1813,7 +1865,7 @@ void EntityFrame4_CL_ReadFrame(void) EntityFrame4_ResetDatabase(d); } -qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t *states) +qboolean 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; @@ -1874,9 +1926,9 @@ qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_datab SZ_Clear(&buf); // entity exists, build an update (if empty there is no change) // find the state in the list - for (;i < numstates && states[i].number < n;i++); + for (;i < numstates && states[i]->number < n;i++); // make the message - s = states + i; + s = states[i]; if (s->number == n) { // build the update @@ -2032,8 +2084,8 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi else { bits = changedbits; - if ((bits & E5_ORIGIN) && (s->flags & RENDER_LOWPRECISION) && (s->exteriormodelforclient || s->tagentity || s->viewmodelforclient || (s->number >= 1 && s->number <= svs.maxclients) || 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)) - // maybe also add: ((model = sv.models[s->modelindex]) != NULL && model->name[0] == '*') + if ((bits & E5_ORIGIN) && (!(s->flags & RENDER_LOWPRECISION) || s->exteriormodelforclient || s->tagentity || s->viewmodelforclient || (s->number >= 1 && s->number <= svs.maxclients) || 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)) + // maybe also add: ((model = SV_GetModelByIndex(s->modelindex)) != NULL && model->name[0] == '*') bits |= E5_ORIGIN32; // possible values: // negative origin: @@ -2390,15 +2442,12 @@ static int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t void EntityFrame5_CL_ReadFrame(void) { - int i, n, enumber; + int n, enumber, framenum; entity_t *ent; entity_state_t *s; // read the number of this frame to echo back in next input packet - for (i = 0;i < LATESTFRAMENUMS-1;i++) - cl.latestframenums[i] = cl.latestframenums[i+1]; - cl.latestframenums[LATESTFRAMENUMS-1] = MSG_ReadLong(); - if (developer_networkentities.integer >= 10) - Con_Printf("recv: svc_entities %i\n", cl.latestframenums[LATESTFRAMENUMS-1]); + framenum = MSG_ReadLong(); + CL_NewFrameReceived(framenum); 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(); // read entity numbers until we find a 0x8000 @@ -2523,7 +2572,7 @@ void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum) d->packetlog[i].packetnumber = 0; } -qboolean 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) +qboolean 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; @@ -2556,8 +2605,9 @@ qboolean EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_datab // detect changes in states num = 1; - for (i = 0, n = states;i < numstates;i++, n++) + for (i = 0;i < numstates;i++) { + n = states[i]; // mark gaps in entity numbering as removed entities for (;num < n->number;num++) {