{
// ! 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 flags;
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,0,0,0,0,0}//unsigned char unused[6]; // !
+ 0//unsigned char unused; // !
};
// 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);
}
+// 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.
+
+void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, qboolean *sectionstarted)
+{
+ int version;
+ prvm_eval_t *val, *val2;
+ version = 0;
+ if (doupdate)
+ {
+ 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 (msg->cursize + 2 > msg->maxsize)
+ {
+ // 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
+ {
+ // 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;
+ }
+ }
+ }
+ // 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)
+ {
+ *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)
{
- 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;
+ 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;
- --csqc_clent;
- if(!sv2csqcents_version[csqc_clent])
- EntityFrameCSQC_InitClientVersions(csqc_clent, false);
+ // 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);
- for (csqcents = i = 0, s = states;i < numstates;i++, s++)
+ sv2csqcbuf = msg;
+ num = 1;
+ for (i = 0, n = states;i < numstates;i++, n++)
{
- //[515]: entities remove
- if(i+1 >= numstates)
- t2 = prog->num_edicts;
- else
- t2 = states[i+1].number;
- if(!i)
+ // 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 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])
{
- t0 = 1;
- t2 = s->number;
+ host_client->statsdeltabits[i >> 3] |= 1 << (i & 7);
+ host_client->stats[i] = stats[i];
}
- 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_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
- if(val->function)
+void Protocol_WriteStatsReliable(void)
+{
+ int i;
+ if (!host_client->netconnection)
+ return;
+ // detect changes in stats and write reliable messages
+ for (i = 0;i < MAX_CL_STATS;i++)
+ {
+ // quickly skip zero bytes
+ if (!host_client->statsdeltabits[i >> 3])
{
- val2 = PRVM_EDICTFIELDVALUE((&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;
- PRVM_ExecuteProgram(val->function, "Null SendEntity\n");
- if(!prog->globals.generic[OFS_RETURN])
+ i |= 7;
+ continue;
+ }
+ // 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)
{
- buf.cursize -= 2;
- if(sv2csqcents_version[csqc_clent][s->number])
- {
- sv2csqcents_version[csqc_clent][s->number] = 0;
- MSG_WriteShort(&buf, (unsigned short)s->number | 0x8000);
- csqcents++;
- }
+ 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]);
}
else
{
- sv2csqcents_version[csqc_clent][s->number] = (unsigned char)val2->_float;
- csqcents++;
+ 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)
{
const entity_state_t *s;
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++)
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++)
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);
}
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;
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)
}
}
-void EntityState5_ReadUpdate(entity_state_t *s)
+void EntityState5_ReadUpdate(entity_state_t *s, int number)
{
int bits;
bits = MSG_ReadByte();
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]);
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)
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)
else
{
// update entity
- EntityState5_ReadUpdate(s);
+ EntityState5_ReadUpdate(s, enumber);
}
// set the cl.entities_active flag
cl.entities_active[enumber] = s->active;
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;
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, 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;
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
{
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] < (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;
+ }
+ else
+ d->priorities[num] = 0;
}
}
{
for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= msg->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);
}
-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)
s = &ent->state_current;
*s = defaultstate;
s->active = true;
+ s->number = enumber;
s->colormap = enumber;
playerflags = MSG_ReadShort();
MSG_ReadVector(s->origin, cls.protocol);
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
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]);
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)
projects / xonotic / darkplaces.git / blobdiff