void EntityState_ReadUpdate(entity_state_t *e, int number)
{
int bits;
- if (!e->active)
- {
- *e = defaultstate;
- e->active = true;
- }
+ cl_entities_active[number] = true;
+ e->active = true;
e->time = cl.mtime[0];
e->number = number;
}
}
- if (dpprotocol == DPPROTOCOL_VERSION2)
+ if (cl.protocol == PROTOCOL_DARKPLACES2)
{
if (bits & E_ORIGIN1)
e->origin[0] = (signed short) MSG_ReadShort();
{
if (bits & E_FLAGS)
e->flags = MSG_ReadByte();
- if (e->flags & RENDER_LOWPRECISION || dpprotocol == DPPROTOCOL_VERSION2)
+ if (e->flags & RENDER_LOWPRECISION || cl.protocol == PROTOCOL_DARKPLACES2)
{
if (bits & E_ORIGIN1)
e->origin[0] = (signed short) MSG_ReadShort();
e->glowsize = MSG_ReadByte();
if (bits & E_GLOWCOLOR)
e->glowcolor = MSG_ReadByte();
- if (dpprotocol == DPPROTOCOL_VERSION2)
+ if (cl.protocol == PROTOCOL_DARKPLACES2)
if (bits & E_FLAGS)
e->flags = MSG_ReadByte();
if (bits & E_TAGATTACHMENT)
e->tagentity = MSG_ReadShort();
e->tagindex = MSG_ReadByte();
}
+
+ if (developer_networkentities.integer >= 2)
+ {
+ Con_Printf("ReadUpdate e%i", number);
+
+ if (bits & E_ORIGIN1)
+ Con_Printf(" E_ORIGIN1 %f", e->origin[0]);
+ if (bits & E_ORIGIN2)
+ Con_Printf(" E_ORIGIN2 %f", e->origin[1]);
+ if (bits & E_ORIGIN3)
+ Con_Printf(" E_ORIGIN3 %f", e->origin[2]);
+ if (bits & E_ANGLE1)
+ Con_Printf(" E_ANGLE1 %f", e->angles[0]);
+ if (bits & E_ANGLE2)
+ Con_Printf(" E_ANGLE2 %f", e->angles[1]);
+ if (bits & E_ANGLE3)
+ Con_Printf(" E_ANGLE3 %f", e->angles[2]);
+ if (bits & (E_MODEL1 | E_MODEL2))
+ Con_Printf(" E_MODEL %i", e->modelindex);
+
+ if (bits & (E_FRAME1 | E_FRAME2))
+ Con_Printf(" E_FRAME %i", e->frame);
+ if (bits & (E_EFFECTS1 | E_EFFECTS2))
+ Con_Printf(" E_EFFECTS %i", e->effects);
+ if (bits & E_ALPHA)
+ Con_Printf(" E_ALPHA %f", e->alpha / 255.0f);
+ if (bits & E_SCALE)
+ Con_Printf(" E_SCALE %f", e->scale / 16.0f);
+ if (bits & E_COLORMAP)
+ Con_Printf(" E_COLORMAP %i", e->colormap);
+ if (bits & E_SKIN)
+ Con_Printf(" E_SKIN %i", e->skin);
+
+ if (bits & E_GLOWSIZE)
+ Con_Printf(" E_GLOWSIZE %i", e->glowsize * 8);
+ if (bits & E_GLOWCOLOR)
+ Con_Printf(" E_GLOWCOLOR %i", e->glowcolor);
+
+ if (bits & E_TAGATTACHMENT)
+ Con_Printf(" E_TAGATTACHMENT e%i:%i", e->tagentity, e->tagindex);
+ Con_Printf("\n");
+ }
}
// (server) clears the database to contain no frames (thus delta compression compresses against nothing)
{
if (f->numentities >= MAX_ENTITY_DATABASE)
Host_Error("EntityFrame_Read: entity list too big\n");
- memcpy(f->entitydata + f->numentities, old, sizeof(entity_state_t));
- f->entitydata[f->numentities].time = cl.mtime[0];
- old++;
- f->numentities++;
+ f->entitydata[f->numentities] = *old++;
+ f->entitydata[f->numentities++].time = cl.mtime[0];
}
if (removed)
{
-int EntityFrame4_SV_ChooseCommitToReplace(entity_database4_t *d)
-{
- int i, best, bestframenum;
- best = 0;
- bestframenum = d->commit[0].framenum;
- for (i = 0;i < MAX_ENTITY_HISTORY;i++)
- {
- if (!d->commit[i].numentities)
- return i;
- if (bestframenum > d->commit[i].framenum)
- {
- bestframenum = d->commit[i].framenum;
- best = i;
- }
- }
- return best;
-}
-
entity_state_t *EntityFrame4_GetReferenceEntity(entity_database4_t *d, int number)
{
if (d->maxreferenceentities <= number)
}
// clear the newly created entities
for (;oldmax < d->maxreferenceentities;oldmax++)
+ {
d->referenceentity[oldmax] = defaultstate;
+ d->referenceentity[oldmax].number = oldmax;
+ }
}
return d->referenceentity + number;
}
d = Mem_Alloc(pool, sizeof(*d));
d->mempool = pool;
EntityFrame4_ResetDatabase(d);
+ d->ackframenum = -1;
return d;
}
{
int i;
d->referenceframenum = -1;
- d->ackframenum = -1;
for (i = 0;i < MAX_ENTITY_HISTORY;i++)
d->commit[i].numentities = 0;
+ for (i = 0;i < d->maxreferenceentities;i++)
+ d->referenceentity[i] = defaultstate;
}
-void EntityFrame4_AckFrame(entity_database4_t *d, int framenum)
+int EntityFrame4_AckFrame(entity_database4_t *d, int framenum)
{
- int i, foundit = false;
- entity_state_t *s;
+ int i, j, found = false;
entity_database4_commit_t *commit;
- // check if client is requesting no delta compression
+ if (d->referenceframenum == framenum)
+ return true;
if (framenum == -1)
{
EntityFrame4_ResetDatabase(d);
- return;
+ return true;
}
- for (i = 0;i < MAX_ENTITY_HISTORY;i++)
+ for (i = 0, commit = d->commit;i < MAX_ENTITY_HISTORY;i++, commit++)
{
- if (d->commit[i].numentities && d->commit[i].framenum <= framenum)
+ if (commit->numentities && commit->framenum <= framenum)
{
- if (d->commit[i].framenum == framenum)
+ if (commit->framenum == framenum)
{
- // apply commit to database
- commit = d->commit + i;
- d->referenceframenum = commit->framenum;
- while (commit->numentities--)
+ found = true;
+ d->referenceframenum = framenum;
+ if (developer_networkentities.integer >= 3)
{
- s = commit->entity + commit->numentities;
- *EntityFrame4_GetReferenceEntity(d, s->number) = *s;
+ for (j = 0;j < commit->numentities;j++)
+ {
+ entity_state_t *s = EntityFrame4_GetReferenceEntity(d, commit->entity[j].number);
+ if (commit->entity[j].active != s->active)
+ {
+ if (commit->entity[j].active)
+ Con_Printf("commit entity %i has become active (modelindex %i)\n", commit->entity[j].number, commit->entity[j].modelindex);
+ else
+ Con_Printf("commit entity %i has become inactive (modelindex %i)\n", commit->entity[j].number, commit->entity[j].modelindex);
+ }
+ *s = commit->entity[j];
+ }
}
- foundit = true;
+ else
+ for (j = 0;j < commit->numentities;j++)
+ *EntityFrame4_GetReferenceEntity(d, commit->entity[j].number) = commit->entity[j];
}
- d->commit[i].numentities = 0;
- d->commit[i].framenum = -1;
+ commit->numentities = 0;
}
}
- if (!foundit)
- Con_DPrintf("EntityFrame4_AckFrame: frame %i not found in database, expect glitches!\n", framenum);
-}
-
-void EntityFrame4_SV_WriteFrame_Begin(entity_database4_t *d, sizebuf_t *msg, int framenum)
-{
- d->currentcommit = d->commit + EntityFrame4_SV_ChooseCommitToReplace(d);
- d->currentcommit->numentities = 0;
- d->currentcommit->framenum = framenum;
- MSG_WriteByte(msg, svc_entities);
- MSG_WriteLong(msg, d->referenceframenum);
- MSG_WriteLong(msg, d->currentcommit->framenum);
+ return found;
}
int EntityFrame4_SV_WriteFrame_Entity(entity_database4_t *d, sizebuf_t *msg, int maxbytes, entity_state_t *s)
return true;
}
-void EntityFrame4_SV_WriteFrame_End(entity_database4_t *d, sizebuf_t *msg)
-{
- // remove world message (invalid, and thus a good terminator)
- MSG_WriteShort(msg, 0x8000);
- // just to be sure
- d->currentcommit = NULL;
-}
-
extern void CL_MoveLerpEntityStates(entity_t *ent);
void EntityFrame4_CL_ReadFrame(entity_database4_t *d)
{
- int i, n, cnumber, referenceframenum, framenum, enumber, done, stopnumber;
- entity_state_t *e;
+ int i, n, cnumber, referenceframenum, framenum, enumber, done, stopnumber, skip = false;
// read the number of the frame this refers to
referenceframenum = MSG_ReadLong();
// read the number of this frame
framenum = MSG_ReadLong();
// read the start number
enumber = MSG_ReadShort();
- EntityFrame4_AckFrame(d, referenceframenum);
- for (i = 0;i < MAX_ENTITY_HISTORY;i++)
- if (!d->commit[i].numentities)
- break;
- if (i < MAX_ENTITY_HISTORY)
+ if (developer_networkentities.integer >= 1)
{
- d->currentcommit = d->commit + i;
- d->ackframenum = d->currentcommit->framenum = framenum;
- d->currentcommit->numentities = 0;
+ Con_Printf("recv svc_entities ref:%i num:%i (database: ref:%i commits:", referenceframenum, framenum, d->referenceframenum);
+ for (i = 0;i < MAX_ENTITY_HISTORY;i++)
+ if (d->commit[i].numentities)
+ Con_Printf(" %i", d->commit[i].framenum);
+ Con_Printf("\n");
}
- else
+ if (!EntityFrame4_AckFrame(d, referenceframenum))
{
- Con_Printf("EntityFrame4_CL_ReadFrame: error while decoding frame %i: database full, resetting, expect glitches!!\n", framenum);
- d->currentcommit = NULL;
+ Con_Printf("EntityFrame4_CL_ReadFrame: reference frame invalid (VERY BAD ERROR), this update will be skipped\n");
+ skip = true;
+ d->ackframenum = -1;
EntityFrame4_ResetDatabase(d);
}
+ d->currentcommit = NULL;
+ for (i = 0;i < MAX_ENTITY_HISTORY;i++)
+ {
+ if (!d->commit[i].numentities)
+ {
+ d->currentcommit = d->commit + i;
+ d->currentcommit->framenum = d->ackframenum = framenum;
+ d->currentcommit->numentities = 0;
+ }
+ }
+ if (d->currentcommit == NULL)
+ {
+ Con_Printf("EntityFrame4_CL_ReadFrame: error while decoding frame %i: database full, reading but not storing this update\n", framenum);
+ skip = true;
+ }
done = false;
while (!done && !msg_badread)
{
+ // read the number of the modified entity
+ // (gaps will be copied unmodified)
n = (unsigned short)MSG_ReadShort();
if (n == 0x8000)
{
// no more entities in this update, but we still need to copy the
- // rest of the reference entities
+ // rest of the reference entities (final gap)
done = true;
// read end of range number, then process normally
n = (unsigned short)MSG_ReadShort();
// process entities in range from the last one to the changed one
for (;enumber < stopnumber;enumber++)
{
- e = EntityFrame4_GetReferenceEntity(d, enumber);
+ if (skip)
+ {
+ if (enumber == cnumber && (n & 0x8000) == 0)
+ {
+ entity_state_t tempstate;
+ EntityState_ReadUpdate(&tempstate, enumber);
+ }
+ continue;
+ }
+ // slide the current into the previous slot
cl_entities[enumber].state_previous = cl_entities[enumber].state_current;
- // skipped (unchanged), copy from reference database
- cl_entities[enumber].state_current = *e;
+ // copy a new current from reference database
+ cl_entities[enumber].state_current = *EntityFrame4_GetReferenceEntity(d, enumber);
+ // if this is the one to modify, read more data...
if (enumber == cnumber)
{
- // modified
if (n & 0x8000)
{
// simply removed
+ if (developer_networkentities.integer >= 2)
+ Con_Printf("entity %i: remove\n", enumber);
cl_entities[enumber].state_current = defaultstate;
}
else
{
// read the changes
+ if (developer_networkentities.integer >= 2)
+ Con_Printf("entity %i: update\n", enumber);
EntityState_ReadUpdate(&cl_entities[enumber].state_current, enumber);
}
}
+ else if (developer_networkentities.integer >= 4)
+ Con_Printf("entity %i: copy\n", enumber);
+ // fix the number (it gets wiped occasionally by copying from defaultstate)
cl_entities[enumber].state_current.number = enumber;
- if (cl_entities[enumber].state_current.active != cl_entities[enumber].state_previous.active)
+ // check if we need to update the lerp stuff
+ if (cl_entities[enumber].state_current.active)
{
- if (cl_entities[enumber].state_current.active)
- Con_Printf("entity #%i has become active\n");
- else if (cl_entities[enumber].state_current.active)
- Con_Printf("entity #%i has become inactive\n");
+ CL_MoveLerpEntityStates(&cl_entities[enumber]);
+ cl_entities_active[enumber] = true;
}
- CL_MoveLerpEntityStates(&cl_entities[enumber]);
- cl_entities_active[enumber] = true;
+ // add this to the commit entry whether it is modified or not
if (d->currentcommit)
EntityFrame4_AddCommitEntity(d, &cl_entities[enumber].state_current);
+ // print extra messages if desired
+ if (developer_networkentities.integer >= 2 && cl_entities[enumber].state_current.active != cl_entities[enumber].state_previous.active)
+ {
+ if (cl_entities[enumber].state_current.active)
+ Con_Printf("entity #%i has become active\n", enumber);
+ else if (cl_entities[enumber].state_previous.active)
+ Con_Printf("entity #%i has become inactive\n", enumber);
+ }
}
}
d->currentcommit = NULL;