{
// ! 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,//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}//unsigned char unused[2]; // !
};
// LordHavoc: I own protocol ranges 96, 97, 3500-3599
};
static mempool_t *sv2csqc = NULL;
-int csqc_clent = 0;
+int csqc_clientnum = 0;
sizebuf_t *sv2csqcbuf = NULL;
static unsigned char *sv2csqcents_version[MAX_SCOREBOARD];
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(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0)
- return;
- --csqc_clent;
- if(!sv2csqcents_version[csqc_clent])
- EntityFrameCSQC_InitClientVersions(csqc_clent, false);
+// 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.
- for (csqcents = i = 0, s = states;i < numstates;i++, s++)
+void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, qboolean *sectionstarted)
+{
+ int version;
+ prvm_eval_t *val, *val2;
+ version = 0;
+ if (doupdate)
{
- //[515]: entities remove
- if(i+1 >= numstates)
- t2 = prog->num_edicts;
- else
- t2 = states[i+1].number;
- if(!i)
- {
- t0 = 1;
- t2 = s->number;
- }
- else
- t0 = s->number+1;
- for(t=t0; t<t2 ;t++)
- if(sv2csqcents_version[csqc_clent][t])
- {
- 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);
- }
- sv2csqcents_version[csqc_clent][t] = 0;
- MSG_WriteShort(&buf, (unsigned short)t | 0x8000);
- csqcents++;
- }
- //[515]: entities remove
-
-// if(!s->active)
-// continue;
- val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
- if(val->function)
- {
- val2 = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.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;
+ if (msg->cursize + !*sectionstarted + 2 + 1 + 2 > msg->maxsize)
+ 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)
+ return;
+ if (version)
+ {
+ // if there's no SendEntity function, treat it as a remove
+ val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity);
+ if (val->function)
+ {
+ // 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])
+ if(prog->globals.generic[OFS_RETURN])
{
- buf.cursize -= 2;
- if(sv2csqcents_version[csqc_clent][s->number])
+ if (msg->cursize + 2 > msg->maxsize)
{
- sv2csqcents_version[csqc_clent][s->number] = 0;
- MSG_WriteShort(&buf, (unsigned short)s->number | 0x8000);
- csqcents++;
+ // 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;
}
else
{
- sv2csqcents_version[csqc_clent][s->number] = (unsigned char)val2->_float;
- csqcents++;
+ // 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;
}
- if (msg->cursize + buf.cursize > msg->maxsize)
- break;
}
}
- if(csqcents)
+ // 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)
{
- if(csqcents > 1)
- {
- MSG_WriteShort(&buf, 0);
- SZ_Write(msg, buf.data, buf.cursize);
- }
- sv2csqcbuf = NULL;
+ *sectionstarted = 1;
+ MSG_WriteByte(msg, svc_csqcentities);
+ }
+ // write the remove message
+ MSG_WriteShort(msg, (unsigned short)number | 0x8000);
+ sv2csqcents_version[csqc_clientnum][number] = 0;
+}
+
+//[515]: we use only one array per-client for SendEntity feature
+void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states)
+{
+ int i, num;
+ qboolean sectionstarted = false;
+ const entity_state_t *n;
+
+ // 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 >= 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])
+ 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++;
+ }
+ // 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;
}
void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_state_t *states)
for (i = 0, s = states;i < numstates;i++, s++)
{
- val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
+ val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
if(val && val->function)
continue;
ent = states + i;
number = ent->number;
- val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.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++)
d->currententitynumber = 1;
for (i = 0, n = startnumber;n < prog->max_edicts;n++)
{
- val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[n]), prog->fieldoffsets.SendEntity);
+ val = PRVM_EDICTFIELDVALUE((&prog->edicts[n]), prog->fieldoffsets.SendEntity);
if(val && val->function)
continue;
// find the old state to delta from
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 from the player
- if (VectorDistance(d->states[d->viewentnum].origin, s->origin) < 1024.0f)
+ if (VectorDistance(d->states[d->viewentnum].netcenter, s->netcenter) < 1024.0f)
priority++;
return bound(1, priority, E5_PROTOCOL_PRIORITYLEVELS - 1);
}
unsigned int bits = 0;
prvm_eval_t *val;
- val = PRVM_GETEDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
+ val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
if(val && val->function)
return;
if (developer_networkentities.integer)
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)
}
// 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
projects / xonotic / darkplaces.git / blobdiff