// this is 80 bytes
entity_state_t defaultstate =
{
- // ! means this is sent to client
- 0,//double time; // time this state was built (used on client for interpolation)
- {0,0,0},//float origin[3]; // !
- {0,0,0},//float angles[3]; // !
- 0,//int number; // ! entity number this state is for
- 0,//int effects; // !
- 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; // !
- 0,//unsigned char lightpflags; // !
- 0,//unsigned char colormap; // !
- 0,//unsigned char skin; // ! also chooses cubemap for rtlights if lightpflags & LIGHTPFLAGS_FULLDYNAMIC
- 255,//unsigned char alpha; // !
- 16,//unsigned char scale; // !
- 0,//unsigned char glowsize; // !
- 254,//unsigned char glowcolor; // !
- 0,//unsigned char flags; // !
- 0,//unsigned char tagindex; // !
+ // ! means this is not sent to client
+ 0,//double time; // ! time this state was built (used on client for interpolation)
+ {0,0,0},//float origin[3];
+ {0,0,0},//float angles[3];
+ 0,//int number; // entity number this state is for
+ 0,//int effects;
+ 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;
+ 0,//unsigned char lightpflags;
+ 0,//unsigned char colormap;
+ 0,//unsigned char skin; // also chooses cubemap for rtlights if lightpflags & LIGHTPFLAGS_FULLDYNAMIC
+ 255,//unsigned char alpha;
+ 16,//unsigned char scale;
+ 0,//unsigned char glowsize;
+ 254,//unsigned char glowcolor;
+ 0,//unsigned char flags;
+ 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}//unsigned char unused[5];
+ {0,0}//unsigned char unused[2]; // !
};
-void ClearStateToDefault(entity_state_t *s)
+// LordHavoc: I own protocol ranges 96, 97, 3500-3599
+
+struct
+{
+ int number;
+ const char *name;
+}
+protocolversioninfo[] =
+{
+ {0, "UNKNOWN"},
+ {3504, "DP7"},
+ {3503, "DP6"},
+ {3502, "DP5"},
+ {3501, "DP4"},
+ {3500, "DP3"},
+ {97, "DP2"},
+ {96, "DP1"},
+ {15, "QUAKEDP"},
+ {250, "NEHAHRAMOVIE"},
+ {15, "QUAKE"},
+ {0, NULL}
+};
+
+protocolversion_t Protocol_EnumForName(const char *s)
+{
+ int i;
+ for (i = 1;protocolversioninfo[i].name;i++)
+ if (!strcasecmp(s, protocolversioninfo[i].name))
+ return i;
+ return PROTOCOL_UNKNOWN;
+}
+
+const char *Protocol_NameForEnum(protocolversion_t p)
+{
+ return protocolversioninfo[p].name;
+}
+
+protocolversion_t Protocol_EnumForNumber(int n)
+{
+ int i;
+ for (i = 1;protocolversioninfo[i].name;i++)
+ if (protocolversioninfo[i].number == n)
+ return i;
+ return PROTOCOL_UNKNOWN;
+}
+
+int Protocol_NumberForEnum(protocolversion_t p)
+{
+ return protocolversioninfo[p].number;
+}
+
+void Protocol_Names(char *buffer, size_t buffersize)
+{
+ int i;
+ if (buffersize < 1)
+ return;
+ buffer[0] = 0;
+ for (i = 1;protocolversioninfo[i].name;i++)
+ {
+ if (i > 1)
+ strlcat(buffer, " ", sizeof(buffer));
+ strlcat(buffer, protocolversioninfo[i].name, sizeof(buffer));
+ }
+}
+
+// keep track of quake entities because they need to be killed if they get stale
+int cl_lastquakeentity = 0;
+qbyte cl_isquakeentity[MAX_EDICTS];
+
+void EntityFrameQuake_ReadEntity(int bits)
{
- *s = defaultstate;
+ int num;
+ entity_t *ent;
+ entity_state_t s;
+
+ if (bits & U_MOREBITS)
+ bits |= (MSG_ReadByte()<<8);
+ if ((bits & U_EXTEND1) && cl.protocol != PROTOCOL_NEHAHRAMOVIE)
+ {
+ bits |= MSG_ReadByte() << 16;
+ if (bits & U_EXTEND2)
+ bits |= MSG_ReadByte() << 24;
+ }
+
+ if (bits & U_LONGENTITY)
+ num = (unsigned short) MSG_ReadShort ();
+ else
+ num = MSG_ReadByte ();
+
+ if (num >= MAX_EDICTS)
+ Host_Error("EntityFrameQuake_ReadEntity: entity number (%i) >= MAX_EDICTS (%i)\n", num, MAX_EDICTS);
+ if (num < 1)
+ Host_Error("EntityFrameQuake_ReadEntity: invalid entity number (%i)\n", num);
+
+ if (cl_num_entities <= num)
+ {
+ cl_num_entities = num + 1;
+ if (num >= cl_max_entities)
+ CL_ExpandEntities(num);
+ }
+
+ ent = cl_entities + num;
+
+ // note: this inherits the 'active' state of the baseline chosen
+ // (state_baseline is always active, state_current may not be active if
+ // the entity was missing in the last frame)
+ if (bits & U_DELTA)
+ s = ent->state_current;
+ else
+ {
+ s = ent->state_baseline;
+ s.active = true;
+ }
+
+ cl_isquakeentity[num] = true;
+ if (cl_lastquakeentity < num)
+ cl_lastquakeentity = num;
+ s.number = num;
+ s.time = cl.mtime[0];
+ s.flags = 0;
+ if (bits & U_MODEL) s.modelindex = (s.modelindex & 0xFF00) | MSG_ReadByte();
+ if (bits & U_FRAME) s.frame = (s.frame & 0xFF00) | MSG_ReadByte();
+ if (bits & U_COLORMAP) s.colormap = MSG_ReadByte();
+ if (bits & U_SKIN) s.skin = MSG_ReadByte();
+ if (bits & U_EFFECTS) s.effects = (s.effects & 0xFF00) | MSG_ReadByte();
+ if (bits & U_ORIGIN1) s.origin[0] = MSG_ReadCoord(cl.protocol);
+ if (bits & U_ANGLE1) s.angles[0] = MSG_ReadAngle(cl.protocol);
+ if (bits & U_ORIGIN2) s.origin[1] = MSG_ReadCoord(cl.protocol);
+ if (bits & U_ANGLE2) s.angles[1] = MSG_ReadAngle(cl.protocol);
+ if (bits & U_ORIGIN3) s.origin[2] = MSG_ReadCoord(cl.protocol);
+ if (bits & U_ANGLE3) s.angles[2] = MSG_ReadAngle(cl.protocol);
+ if (bits & U_STEP) s.flags |= RENDER_STEP;
+ if (bits & U_ALPHA) s.alpha = MSG_ReadByte();
+ if (bits & U_SCALE) s.scale = MSG_ReadByte();
+ if (bits & U_EFFECTS2) s.effects = (s.effects & 0x00FF) | (MSG_ReadByte() << 8);
+ if (bits & U_GLOWSIZE) s.glowsize = MSG_ReadByte();
+ if (bits & U_GLOWCOLOR) s.glowcolor = MSG_ReadByte();
+ if (bits & U_COLORMOD) {int c = MSG_ReadByte();s.colormod[0] = (qbyte)(((c >> 5) & 7) * (32.0f / 7.0f));s.colormod[1] = (qbyte)(((c >> 2) & 7) * (32.0f / 7.0f));s.colormod[2] = (qbyte)((c & 3) * (32.0f / 3.0f));}
+ if (bits & U_GLOWTRAIL) s.flags |= RENDER_GLOWTRAIL;
+ if (bits & U_FRAME2) s.frame = (s.frame & 0x00FF) | (MSG_ReadByte() << 8);
+ if (bits & U_MODEL2) s.modelindex = (s.modelindex & 0x00FF) | (MSG_ReadByte() << 8);
+ if (bits & U_VIEWMODEL) s.flags |= RENDER_VIEWMODEL;
+ if (bits & U_EXTERIORMODEL) s.flags |= RENDER_EXTERIORMODEL;
+
+ // LordHavoc: to allow playback of the Nehahra movie
+ if (cl.protocol == PROTOCOL_NEHAHRAMOVIE && (bits & U_EXTEND1))
+ {
+ // LordHavoc: evil format
+ int i = MSG_ReadFloat();
+ int j = MSG_ReadFloat() * 255.0f;
+ if (i == 2)
+ {
+ i = MSG_ReadFloat();
+ if (i)
+ s.effects |= EF_FULLBRIGHT;
+ }
+ if (j < 0)
+ s.alpha = 0;
+ else if (j == 0 || j >= 255)
+ s.alpha = 255;
+ else
+ s.alpha = j;
+ }
+
+ ent->state_previous = ent->state_current;
+ ent->state_current = s;
+ if (ent->state_current.active)
+ {
+ CL_MoveLerpEntityStates(ent);
+ cl_entities_active[ent->state_current.number] = true;
+ }
+
+ if (msg_badread)
+ Host_Error("EntityFrameQuake_ReadEntity: read error\n");
+}
+
+void EntityFrameQuake_ISeeDeadEntities(void)
+{
+ int num, lastentity;
+ if (cl_lastquakeentity == 0)
+ return;
+ lastentity = cl_lastquakeentity;
+ cl_lastquakeentity = 0;
+ for (num = 0;num <= lastentity;num++)
+ {
+ if (cl_isquakeentity[num])
+ {
+ if (cl_entities_active[num] && cl_entities[num].state_current.time == cl.mtime[0])
+ {
+ cl_isquakeentity[num] = true;
+ cl_lastquakeentity = num;
+ }
+ else
+ {
+ cl_isquakeentity[num] = false;
+ cl_entities_active[num] = false;
+ cl_entities[num].state_current = defaultstate;
+ cl_entities[num].state_current.number = num;
+ }
+ }
+ }
+}
+
+void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_state_t *states)
+{
+ const entity_state_t *s;
+ entity_state_t baseline;
+ int i, bits;
+ sizebuf_t buf;
+ qbyte data[128];
+
+ // prepare the buffer
+ memset(&buf, 0, sizeof(buf));
+ buf.data = data;
+ buf.maxsize = sizeof(data);
+
+ for (i = 0, s = states;i < numstates;i++, s++)
+ {
+ // prepare the buffer
+ SZ_Clear(&buf);
+
+// send an update
+ bits = 0;
+ if (s->number >= 256)
+ bits |= U_LONGENTITY;
+ if (s->flags & RENDER_STEP)
+ bits |= U_STEP;
+ if (s->flags & RENDER_VIEWMODEL)
+ bits |= U_VIEWMODEL;
+ if (s->flags & RENDER_GLOWTRAIL)
+ bits |= U_GLOWTRAIL;
+ if (s->flags & RENDER_EXTERIORMODEL)
+ bits |= U_EXTERIORMODEL;
+
+ // LordHavoc: old stuff, but rewritten to have more exact tolerances
+ baseline = prog->edicts[s->number].priv.server->baseline;
+ if (baseline.origin[0] != s->origin[0])
+ bits |= U_ORIGIN1;
+ if (baseline.origin[1] != s->origin[1])
+ bits |= U_ORIGIN2;
+ if (baseline.origin[2] != s->origin[2])
+ bits |= U_ORIGIN3;
+ if (baseline.angles[0] != s->angles[0])
+ bits |= U_ANGLE1;
+ if (baseline.angles[1] != s->angles[1])
+ bits |= U_ANGLE2;
+ if (baseline.angles[2] != s->angles[2])
+ bits |= U_ANGLE3;
+ if (baseline.colormap != s->colormap)
+ bits |= U_COLORMAP;
+ if (baseline.skin != s->skin)
+ bits |= U_SKIN;
+ if (baseline.frame != s->frame)
+ {
+ bits |= U_FRAME;
+ if (s->frame & 0xFF00)
+ bits |= U_FRAME2;
+ }
+ if (baseline.effects != s->effects)
+ {
+ bits |= U_EFFECTS;
+ if (s->effects & 0xFF00)
+ bits |= U_EFFECTS2;
+ }
+ if (baseline.modelindex != s->modelindex)
+ {
+ bits |= U_MODEL;
+ if (s->modelindex & 0xFF00)
+ bits |= U_MODEL2;
+ }
+ if (baseline.alpha != s->alpha)
+ bits |= U_ALPHA;
+ if (baseline.scale != s->scale)
+ bits |= U_SCALE;
+ if (baseline.glowsize != s->glowsize)
+ bits |= U_GLOWSIZE;
+ if (baseline.glowcolor != s->glowcolor)
+ bits |= U_GLOWCOLOR;
+
+ // if extensions are disabled, clear the relevant update flags
+ if (sv.protocol == PROTOCOL_QUAKE || sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+ bits &= 0x7FFF;
+ if (sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+ if (s->alpha != 255 || s->effects & EF_FULLBRIGHT)
+ bits |= U_EXTEND1;
+
+ // write the message
+ if (bits >= 16777216)
+ bits |= U_EXTEND2;
+ if (bits >= 65536)
+ bits |= U_EXTEND1;
+ if (bits >= 256)
+ bits |= U_MOREBITS;
+ bits |= U_SIGNAL;
+
+ MSG_WriteByte (&buf, bits);
+ if (bits & U_MOREBITS) MSG_WriteByte(&buf, bits>>8);
+ if (bits & U_EXTEND1) MSG_WriteByte(&buf, bits>>16);
+ if (bits & U_EXTEND2) MSG_WriteByte(&buf, bits>>24);
+ if (bits & U_LONGENTITY) MSG_WriteShort(&buf, s->number);
+ else MSG_WriteByte(&buf, s->number);
+
+ if (bits & U_MODEL) MSG_WriteByte(&buf, s->modelindex);
+ if (bits & U_FRAME) MSG_WriteByte(&buf, s->frame);
+ if (bits & U_COLORMAP) MSG_WriteByte(&buf, s->colormap);
+ if (bits & U_SKIN) MSG_WriteByte(&buf, s->skin);
+ if (bits & U_EFFECTS) MSG_WriteByte(&buf, s->effects);
+ if (bits & U_ORIGIN1) MSG_WriteCoord(&buf, s->origin[0], sv.protocol);
+ if (bits & U_ANGLE1) MSG_WriteAngle(&buf, s->angles[0], sv.protocol);
+ if (bits & U_ORIGIN2) MSG_WriteCoord(&buf, s->origin[1], sv.protocol);
+ if (bits & U_ANGLE2) MSG_WriteAngle(&buf, s->angles[1], sv.protocol);
+ if (bits & U_ORIGIN3) MSG_WriteCoord(&buf, s->origin[2], sv.protocol);
+ if (bits & U_ANGLE3) MSG_WriteAngle(&buf, s->angles[2], sv.protocol);
+ if (bits & U_ALPHA) MSG_WriteByte(&buf, s->alpha);
+ if (bits & U_SCALE) MSG_WriteByte(&buf, s->scale);
+ if (bits & U_EFFECTS2) MSG_WriteByte(&buf, s->effects >> 8);
+ if (bits & U_GLOWSIZE) MSG_WriteByte(&buf, s->glowsize);
+ if (bits & U_GLOWCOLOR) MSG_WriteByte(&buf, s->glowcolor);
+ if (bits & U_COLORMOD) {int c = ((int)bound(0, s->colormod[0] * (7.0f / 32.0f), 7) << 5) | ((int)bound(0, s->colormod[0] * (7.0f / 32.0f), 7) << 2) | ((int)bound(0, s->colormod[0] * (3.0f / 32.0f), 3) << 0);MSG_WriteByte(&buf, c);}
+ if (bits & U_FRAME2) MSG_WriteByte(&buf, s->frame >> 8);
+ if (bits & U_MODEL2) MSG_WriteByte(&buf, s->modelindex >> 8);
+
+ // the nasty protocol
+ if ((bits & U_EXTEND1) && sv.protocol == PROTOCOL_NEHAHRAMOVIE)
+ {
+ if (s->effects & EF_FULLBRIGHT)
+ {
+ MSG_WriteFloat(&buf, 2); // QSG protocol version
+ MSG_WriteFloat(&buf, s->alpha <= 0 ? 0 : (s->alpha >= 255 ? 1 : s->alpha * (1.0f / 255.0f))); // alpha
+ MSG_WriteFloat(&buf, 1); // fullbright
+ }
+ else
+ {
+ MSG_WriteFloat(&buf, 1); // QSG protocol version
+ MSG_WriteFloat(&buf, s->alpha <= 0 ? 0 : (s->alpha >= 255 ? 1 : s->alpha * (1.0f / 255.0f))); // alpha
+ }
+ }
+
+ // if the commit is full, we're done this frame
+ if (msg->cursize + buf.cursize > msg->maxsize)
+ {
+ // next frame we will continue where we left off
+ break;
+ }
+ // write the message to the packet
+ SZ_Write(msg, buf.data, buf.cursize);
+ }
}
int EntityState_DeltaBits(const entity_state_t *o, const entity_state_t *n)
}
}
-void EntityState_WriteFields(entity_state_t *ent, sizebuf_t *msg, unsigned int bits)
+void EntityState_WriteFields(const entity_state_t *ent, sizebuf_t *msg, unsigned int bits)
{
- // LordHavoc: have to write flags first, as they can modify protocol
- if (bits & E_FLAGS)
- MSG_WriteByte(msg, ent->flags);
- if (ent->flags & RENDER_LOWPRECISION)
+ if (sv.protocol == PROTOCOL_DARKPLACES2)
{
if (bits & E_ORIGIN1)
- MSG_WriteShort(msg, ent->origin[0]);
+ MSG_WriteCoord16i(msg, ent->origin[0]);
if (bits & E_ORIGIN2)
- MSG_WriteShort(msg, ent->origin[1]);
+ MSG_WriteCoord16i(msg, ent->origin[1]);
if (bits & E_ORIGIN3)
- MSG_WriteShort(msg, ent->origin[2]);
+ MSG_WriteCoord16i(msg, ent->origin[2]);
+ }
+ else
+ {
+ // LordHavoc: have to write flags first, as they can modify protocol
+ if (bits & E_FLAGS)
+ MSG_WriteByte(msg, ent->flags);
+ if (ent->flags & RENDER_LOWPRECISION)
+ {
+ if (bits & E_ORIGIN1)
+ MSG_WriteCoord16i(msg, ent->origin[0]);
+ if (bits & E_ORIGIN2)
+ MSG_WriteCoord16i(msg, ent->origin[1]);
+ if (bits & E_ORIGIN3)
+ MSG_WriteCoord16i(msg, ent->origin[2]);
+ }
+ else
+ {
+ if (bits & E_ORIGIN1)
+ MSG_WriteCoord32f(msg, ent->origin[0]);
+ if (bits & E_ORIGIN2)
+ MSG_WriteCoord32f(msg, ent->origin[1]);
+ if (bits & E_ORIGIN3)
+ MSG_WriteCoord32f(msg, ent->origin[2]);
+ }
+ }
+ if ((sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES2 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4) && (ent->flags & RENDER_LOWPRECISION))
+ {
if (bits & E_ANGLE1)
- MSG_WriteAngle(msg, ent->angles[0]);
+ MSG_WriteAngle8i(msg, ent->angles[0]);
if (bits & E_ANGLE2)
- MSG_WriteAngle(msg, ent->angles[1]);
+ MSG_WriteAngle8i(msg, ent->angles[1]);
if (bits & E_ANGLE3)
- MSG_WriteAngle(msg, ent->angles[2]);
+ MSG_WriteAngle8i(msg, ent->angles[2]);
}
else
{
- if (bits & E_ORIGIN1)
- MSG_WriteFloat(msg, ent->origin[0]);
- if (bits & E_ORIGIN2)
- MSG_WriteFloat(msg, ent->origin[1]);
- if (bits & E_ORIGIN3)
- MSG_WriteFloat(msg, ent->origin[2]);
if (bits & E_ANGLE1)
- MSG_WritePreciseAngle(msg, ent->angles[0]);
+ MSG_WriteAngle16i(msg, ent->angles[0]);
if (bits & E_ANGLE2)
- MSG_WritePreciseAngle(msg, ent->angles[1]);
+ MSG_WriteAngle16i(msg, ent->angles[1]);
if (bits & E_ANGLE3)
- MSG_WritePreciseAngle(msg, ent->angles[2]);
+ MSG_WriteAngle16i(msg, ent->angles[2]);
}
if (bits & E_MODEL1)
MSG_WriteByte(msg, ent->modelindex & 0xFF);
MSG_WriteByte(msg, ent->glowsize);
if (bits & E_GLOWCOLOR)
MSG_WriteByte(msg, ent->glowcolor);
+ if (sv.protocol == PROTOCOL_DARKPLACES2)
+ if (bits & E_FLAGS)
+ MSG_WriteByte(msg, ent->flags);
if (bits & E_TAGATTACHMENT)
{
MSG_WriteShort(msg, ent->tagentity);
MSG_WriteByte(msg, ent->lightpflags);
}
-void EntityState_WriteUpdate(entity_state_t *ent, sizebuf_t *msg, entity_state_t *delta)
+void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const entity_state_t *delta)
{
unsigned int bits;
if (ent->active)
if (cl.protocol == PROTOCOL_DARKPLACES2)
{
if (bits & E_ORIGIN1)
- e->origin[0] = (signed short) MSG_ReadShort();
+ e->origin[0] = MSG_ReadCoord16i();
if (bits & E_ORIGIN2)
- e->origin[1] = (signed short) MSG_ReadShort();
+ e->origin[1] = MSG_ReadCoord16i();
if (bits & E_ORIGIN3)
- e->origin[2] = (signed short) MSG_ReadShort();
+ e->origin[2] = MSG_ReadCoord16i();
}
else
{
if (bits & E_FLAGS)
e->flags = MSG_ReadByte();
- if (e->flags & RENDER_LOWPRECISION || cl.protocol == PROTOCOL_DARKPLACES2)
+ if (e->flags & RENDER_LOWPRECISION)
{
if (bits & E_ORIGIN1)
- e->origin[0] = (signed short) MSG_ReadShort();
+ e->origin[0] = MSG_ReadCoord16i();
if (bits & E_ORIGIN2)
- e->origin[1] = (signed short) MSG_ReadShort();
+ e->origin[1] = MSG_ReadCoord16i();
if (bits & E_ORIGIN3)
- e->origin[2] = (signed short) MSG_ReadShort();
+ e->origin[2] = MSG_ReadCoord16i();
}
else
{
if (bits & E_ORIGIN1)
- e->origin[0] = MSG_ReadFloat();
+ e->origin[0] = MSG_ReadCoord32f();
if (bits & E_ORIGIN2)
- e->origin[1] = MSG_ReadFloat();
+ e->origin[1] = MSG_ReadCoord32f();
if (bits & E_ORIGIN3)
- e->origin[2] = MSG_ReadFloat();
+ e->origin[2] = MSG_ReadCoord32f();
}
}
- if (cl.protocol == PROTOCOL_DARKPLACES5 && !(e->flags & RENDER_LOWPRECISION))
+ if ((cl.protocol == PROTOCOL_DARKPLACES5 || cl.protocol == PROTOCOL_DARKPLACES6) && !(e->flags & RENDER_LOWPRECISION))
{
if (bits & E_ANGLE1)
- e->angles[0] = MSG_ReadPreciseAngle();
+ e->angles[0] = MSG_ReadAngle16i();
if (bits & E_ANGLE2)
- e->angles[1] = MSG_ReadPreciseAngle();
+ e->angles[1] = MSG_ReadAngle16i();
if (bits & E_ANGLE3)
- e->angles[2] = MSG_ReadPreciseAngle();
+ e->angles[2] = MSG_ReadAngle16i();
}
else
{
if (bits & E_ANGLE1)
- e->angles[0] = MSG_ReadAngle();
+ e->angles[0] = MSG_ReadAngle8i();
if (bits & E_ANGLE2)
- e->angles[1] = MSG_ReadAngle();
+ e->angles[1] = MSG_ReadAngle8i();
if (bits & E_ANGLE3)
- e->angles[2] = MSG_ReadAngle();
+ e->angles[2] = MSG_ReadAngle8i();
}
if (bits & E_MODEL1)
e->modelindex = (e->modelindex & 0xFF00) | (unsigned int) MSG_ReadByte();
e->flags = MSG_ReadByte();
if (bits & E_TAGATTACHMENT)
{
- e->tagentity = MSG_ReadShort();
+ e->tagentity = (unsigned short) MSG_ReadShort();
e->tagindex = MSG_ReadByte();
}
if (bits & E_LIGHT)
{
- e->light[0] = MSG_ReadShort();
- e->light[1] = MSG_ReadShort();
- e->light[2] = MSG_ReadShort();
- e->light[3] = MSG_ReadShort();
+ e->light[0] = (unsigned short) MSG_ReadShort();
+ e->light[1] = (unsigned short) MSG_ReadShort();
+ e->light[2] = (unsigned short) MSG_ReadShort();
+ e->light[3] = (unsigned short) MSG_ReadShort();
}
if (bits & E_LIGHTSTYLE)
e->lightstyle = MSG_ReadByte();
Con_Printf(" E_GLOWSIZE %i", e->glowsize * 4);
if (bits & E_GLOWCOLOR)
Con_Printf(" E_GLOWCOLOR %i", e->glowcolor);
-
+
if (bits & E_LIGHT)
Con_Printf(" E_LIGHT %i:%i:%i:%i", e->light[0], e->light[1], e->light[2], e->light[3]);
- if (bits & E_LIGHTPFLAGS)
+ if (bits & E_LIGHTPFLAGS)
Con_Printf(" E_LIGHTPFLAGS %i", e->lightpflags);
if (bits & E_TAGATTACHMENT)
}
}
+// (client and server) allocates a new empty database
+entityframe_database_t *EntityFrame_AllocDatabase(mempool_t *mempool)
+{
+ return Mem_Alloc(mempool, sizeof(entityframe_database_t));
+}
+
+// (client and server) frees the database
+void EntityFrame_FreeDatabase(entityframe_database_t *d)
+{
+ Mem_Free(d);
+}
+
// (server) clears the database to contain no frames (thus delta compression compresses against nothing)
-void EntityFrame_ClearDatabase(entity_database_t *d)
+void EntityFrame_ClearDatabase(entityframe_database_t *d)
{
memset(d, 0, sizeof(*d));
}
// (server and client) removes frames older than 'frame' from database
-void EntityFrame_AckFrame(entity_database_t *d, int frame)
+void EntityFrame_AckFrame(entityframe_database_t *d, int frame)
{
int i;
- if (d->ackframe < frame)
- d->ackframe = frame;
+ d->ackframenum = frame;
for (i = 0;i < d->numframes && d->frames[i].framenum < frame;i++);
// ignore outdated frame acks (out of order packets)
if (i == 0)
f->framenum = framenum;
f->numentities = 0;
if (eye == NULL)
- {
VectorClear(f->eye);
- }
else
- {
VectorCopy(eye, f->eye);
- }
-}
-
-// (server) adds an entity to frame
-void EntityFrame_AddEntity(entity_frame_t *f, entity_state_t *s)
-{
- if (f->numentities < MAX_ENTITY_DATABASE)
- {
- f->entitydata[f->numentities] = *s;
- f->entitydata[f->numentities++].active = true;
- }
}
// (server and client) reads a frame from the database
-void EntityFrame_FetchFrame(entity_database_t *d, int framenum, entity_frame_t *f)
+void EntityFrame_FetchFrame(entityframe_database_t *d, int framenum, entity_frame_t *f)
{
int i, n;
EntityFrame_Clear(f, NULL, -1);
}
// (server and client) adds a entity_frame to the database, for future reference
-void EntityFrame_AddFrame(entity_database_t *d, entity_frame_t *f)
+void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata)
{
int n, e;
entity_frameinfo_t *info;
- VectorCopy(f->eye, d->eye);
+ 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 + f->numentities > MAX_ENTITY_DATABASE || d->numframes >= MAX_ENTITY_HISTORY)
+ 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 = f->framenum;
+ 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 == f->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");
info->firstentity = d->frames[d->numframes - 1].endentity;
else
info->firstentity = 0;
- info->endentity = info->firstentity + f->numentities;
+ info->endentity = info->firstentity + numentities;
d->numframes++;
n = info->firstentity % MAX_ENTITY_DATABASE;
e = MAX_ENTITY_DATABASE - n;
- if (e > f->numentities)
- e = f->numentities;
- memcpy(d->entitydata + n, f->entitydata, sizeof(entity_state_t) * e);
- if (f->numentities > e)
- memcpy(d->entitydata, f->entitydata + e, sizeof(entity_state_t) * (f->numentities - e));
+ 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) writes a frame to network stream
static entity_frame_t deltaframe; // FIXME?
-void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
+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_state_t *ent, *delta;
+ const entity_state_t *ent, *delta;
+ vec3_t eye;
+
+ d->latestframenum++;
+
+ VectorClear(eye);
+ for (i = 0;i < numstates;i++)
+ {
+ if (states[i].number == viewentnum)
+ {
+ VectorSet(eye, states[i].origin[0], states[i].origin[1], states[i].origin[2] + 22);
+ break;
+ }
+ }
+
+ EntityFrame_AddFrame(d, eye, d->latestframenum, numstates, states);
- EntityFrame_AddFrame(d, f);
+ EntityFrame_FetchFrame(d, d->ackframenum, o);
- EntityFrame_FetchFrame(d, d->ackframe > 0 ? d->ackframe : -1, o);
MSG_WriteByte (msg, svc_entities);
MSG_WriteLong (msg, o->framenum);
- MSG_WriteLong (msg, f->framenum);
- MSG_WriteFloat (msg, f->eye[0]);
- MSG_WriteFloat (msg, f->eye[1]);
- MSG_WriteFloat (msg, f->eye[2]);
+ MSG_WriteLong (msg, d->latestframenum);
+ MSG_WriteFloat (msg, eye[0]);
+ MSG_WriteFloat (msg, eye[1]);
+ MSG_WriteFloat (msg, eye[2]);
onum = 0;
- for (i = 0;i < f->numentities;i++)
+ for (i = 0;i < numstates;i++)
{
- ent = f->entitydata + i;
+ ent = states + i;
number = ent->number;
for (;onum < o->numentities && o->entitydata[onum].number < number;onum++)
{
// (client) reads a frame from network stream
static entity_frame_t framedata; // FIXME?
-void EntityFrame_Read(entity_database_t *d)
+void EntityFrame_CL_ReadFrame(void)
{
- int number, removed;
+ int i, number, removed;
entity_frame_t *f = &framedata, *delta = &deltaframe;
entity_state_t *e, *old, *oldend;
+ entity_t *ent;
+ entityframe_database_t *d;
+ if (!cl.entitydatabase)
+ cl.entitydatabase = EntityFrame_AllocDatabase(cl_mempool);
+ d = cl.entitydatabase;
EntityFrame_Clear(f, NULL, -1);
// read the frame header info
f->time = cl.mtime[0];
number = MSG_ReadLong();
- f->framenum = 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->eye[0] = MSG_ReadFloat();
f->eye[1] = MSG_ReadFloat();
f->eye[2] = MSG_ReadFloat();
old = delta->entitydata;
oldend = old + delta->numentities;
// read entities until we hit the magic 0xFFFF end tag
- while ((number = (unsigned short) MSG_ReadShort()) != 0xFFFF)
+ while ((number = (unsigned short) MSG_ReadShort()) != 0xFFFF && !msg_badread)
{
if (msg_badread)
Host_Error("EntityFrame_Read: read error\n");
*e = defaultstate;
}
+ if (cl_num_entities <= number)
+ {
+ cl_num_entities = number + 1;
+ if (number >= cl_max_entities)
+ CL_ExpandEntities(number);
+ }
cl_entities_active[number] = true;
e->active = true;
e->time = cl.mtime[0];
f->entitydata[f->numentities] = *old++;
f->entitydata[f->numentities++].time = cl.mtime[0];
}
- EntityFrame_AddFrame(d, f);
+ EntityFrame_AddFrame(d, f->eye, f->framenum, f->numentities, f->entitydata);
+
+ memset(cl_entities_active, 0, cl_num_entities * sizeof(qbyte));
+ number = 1;
+ for (i = 0;i < f->numentities;i++)
+ {
+ for (;number < f->entitydata[i].number && number < cl_num_entities;number++)
+ {
+ if (cl_entities_active[number])
+ {
+ cl_entities_active[number] = false;
+ cl_entities[number].state_current.active = false;
+ }
+ }
+ if (number >= cl_num_entities)
+ break;
+ // update the entity
+ ent = &cl_entities[number];
+ ent->state_previous = ent->state_current;
+ ent->state_current = f->entitydata[i];
+ CL_MoveLerpEntityStates(ent);
+ // the entity lives again...
+ cl_entities_active[number] = true;
+ number++;
+ }
+ for (;number < cl_num_entities;number++)
+ {
+ if (cl_entities_active[number])
+ {
+ cl_entities_active[number] = false;
+ cl_entities[number].state_current.active = false;
+ }
+ }
}
// (client) returns the frame number of the most recent frame recieved
-int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
+int EntityFrame_MostRecentlyRecievedFrameNum(entityframe_database_t *d)
{
if (d->numframes)
return d->frames[d->numframes - 1].framenum;
-entity_state_t *EntityFrame4_GetReferenceEntity(entity_database4_t *d, int number)
+entity_state_t *EntityFrame4_GetReferenceEntity(entityframe4_database_t *d, int number)
{
if (d->maxreferenceentities <= number)
{
return d->referenceentity + number;
}
-void EntityFrame4_AddCommitEntity(entity_database4_t *d, entity_state_t *s)
+void EntityFrame4_AddCommitEntity(entityframe4_database_t *d, const entity_state_t *s)
{
// resize commit's entity list if full
if (d->currentcommit->maxentities <= d->currentcommit->numentities)
d->currentcommit->entity[d->currentcommit->numentities++] = *s;
}
-entity_database4_t *EntityFrame4_AllocDatabase(mempool_t *pool)
+entityframe4_database_t *EntityFrame4_AllocDatabase(mempool_t *pool)
{
- entity_database4_t *d;
+ entityframe4_database_t *d;
d = Mem_Alloc(pool, sizeof(*d));
d->mempool = pool;
EntityFrame4_ResetDatabase(d);
- d->ackframenum = -1;
return d;
}
-void EntityFrame4_FreeDatabase(entity_database4_t *d)
+void EntityFrame4_FreeDatabase(entityframe4_database_t *d)
{
int i;
for (i = 0;i < MAX_ENTITY_HISTORY;i++)
Mem_Free(d);
}
-void EntityFrame4_ResetDatabase(entity_database4_t *d)
+void EntityFrame4_ResetDatabase(entityframe4_database_t *d)
{
int i;
- d->ackframenum = -1;
d->referenceframenum = -1;
for (i = 0;i < MAX_ENTITY_HISTORY;i++)
d->commit[i].numentities = 0;
d->referenceentity[i] = defaultstate;
}
-int EntityFrame4_AckFrame(entity_database4_t *d, int framenum)
+int EntityFrame4_AckFrame(entityframe4_database_t *d, int framenum, int servermode)
{
int i, j, found;
entity_database4_commit_t *commit;
d->referenceframenum = -1;
for (i = 0;i < d->maxreferenceentities;i++)
d->referenceentity[i] = defaultstate;
+ // if this is the server, remove commits
+ for (i = 0, commit = d->commit;i < MAX_ENTITY_HISTORY;i++, commit++)
+ commit->numentities = 0;
found = true;
}
else if (d->referenceframenum == framenum)
return found;
}
-int EntityFrame4_SV_WriteFrame_Entity(entity_database4_t *d, sizebuf_t *msg, int maxbytes, entity_state_t *s)
-{
- qbyte data[128];
- sizebuf_t buf;
- entity_state_t *e;
- // prepare the buffer
- memset(&buf, 0, sizeof(buf));
- buf.data = data;
- buf.maxsize = sizeof(data);
- // make the update message
- e = EntityFrame4_GetReferenceEntity(d, s->number);
- EntityState_WriteUpdate(s, &buf, e);
- // if the message is empty, skip out now
- if (!buf.cursize)
- return true;
- // if the commit is full, we're done
- if (msg->cursize + buf.cursize + 2 >= min(msg->maxsize, maxbytes))
- return false;
- // add the entity to the commit
- EntityFrame4_AddCommitEntity(d, s);
- // write the message to the packet
- SZ_Write(msg, buf.data, buf.cursize);
- // carry on
- return true;
-}
-
-extern void CL_MoveLerpEntityStates(entity_t *ent);
-void EntityFrame4_CL_ReadFrame(entity_database4_t *d)
+void EntityFrame4_CL_ReadFrame(void)
{
int i, n, cnumber, referenceframenum, framenum, enumber, done, stopnumber, skip = false;
entity_state_t *s;
+ entityframe4_database_t *d;
+ if (!cl.entitydatabase4)
+ cl.entitydatabase4 = EntityFrame4_AllocDatabase(cl_mempool);
+ d = cl.entitydatabase4;
// read the number of the frame this refers to
referenceframenum = MSG_ReadLong();
// read the number of this frame
- framenum = MSG_ReadLong();
+ for (i = 0;i < LATESTFRAMENUMS-1;i++)
+ cl.latestframenums[i] = cl.latestframenums[i+1];
+ cl.latestframenums[LATESTFRAMENUMS-1] = framenum = MSG_ReadLong();
// read the start number
- enumber = MSG_ReadShort();
+ enumber = (unsigned short) MSG_ReadShort();
if (developer_networkentities.integer >= 1)
{
Con_Printf("recv svc_entities num:%i ref:%i database: ref:%i commits:", framenum, referenceframenum, d->referenceframenum);
Con_Printf(" %i", d->commit[i].framenum);
Con_Print("\n");
}
- if (!EntityFrame4_AckFrame(d, referenceframenum))
+ if (!EntityFrame4_AckFrame(d, referenceframenum, false))
{
Con_Print("EntityFrame4_CL_ReadFrame: reference frame invalid (VERY BAD ERROR), this update will be skipped\n");
skip = true;
if (!d->commit[i].numentities)
{
d->currentcommit = d->commit + i;
- d->currentcommit->framenum = d->ackframenum = framenum;
+ d->currentcommit->framenum = framenum;
d->currentcommit->numentities = 0;
}
}
}
// high bit means it's a remove message
cnumber = n & 0x7FFF;
+ // if this is a live entity we may need to expand the array
+ if (cl_num_entities <= cnumber && !(n & 0x8000))
+ {
+ cl_num_entities = cnumber + 1;
+ if (cnumber >= cl_max_entities)
+ CL_ExpandEntities(cnumber);
+ }
// add one (the changed one) if not done
stopnumber = cnumber + !done;
// process entities in range from the last one to the changed one
for (;enumber < stopnumber;enumber++)
{
- if (skip)
+ if (skip || enumber >= cl_num_entities)
{
if (enumber == cnumber && (n & 0x8000) == 0)
{
EntityFrame4_ResetDatabase(d);
}
+void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int numstates, const entity_state_t *states)
+{
+ const entity_state_t *e, *s;
+ entity_state_t inactiveentitystate;
+ int i, n, startnumber;
+ sizebuf_t buf;
+ qbyte data[128];
+ // if there isn't enough space to accomplish anything, skip it
+ if (msg->cursize + 24 > msg->maxsize)
+ return;
+ // prepare the buffer
+ memset(&buf, 0, sizeof(buf));
+ buf.data = data;
+ buf.maxsize = sizeof(data);
+ for (i = 0;i < MAX_ENTITY_HISTORY;i++)
+ if (!d->commit[i].numentities)
+ break;
+ // if commit buffer full, just don't bother writing an update this frame
+ if (i == MAX_ENTITY_HISTORY)
+ return;
+ d->currentcommit = d->commit + i;
-/*
-int EntityState5_PriorityForChangedBits(int changedbits)
-{
- if (changedbits & E5_ISACTIVE)
- return 2;
- else if (changedbits & (E5_FLAGS | E5_ATTACHMENT | E5_MODEL | E5_SKIN | E5_EXTERIORFORENTITY | E5_COLORMAP | E5_LIGHT | E5_GLOW | E5_EFFECTS | E5_ORIGIN | E5_ANGLES | E5_FRAME | E5_ALPHA | E5_SCALE))
- return 1;
- else
- return 0;
-}
+ // this state's number gets played around with later
+ inactiveentitystate = defaultstate;
-void EntityState5_WriteUpdate(int number, entitystate_t *s, int changedbits, sizebuf_t *msg)
-{
- bits = 0;
- if (!s->active)
- MSG_WriteShort(msg, number | 0x8000);
+ d->currentcommit->numentities = 0;
+ d->currentcommit->framenum = ++d->latestframenumber;
+ MSG_WriteByte(msg, svc_entities);
+ MSG_WriteLong(msg, d->referenceframenum);
+ MSG_WriteLong(msg, d->currentcommit->framenum);
+ if (developer_networkentities.integer >= 1)
+ {
+ 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++)
+ if (d->commit[i].numentities)
+ Con_Printf(" %i", d->commit[i].framenum);
+ Con_Print(")\n");
+ }
+ if (d->currententitynumber >= prog->max_edicts)
+ startnumber = 1;
else
+ startnumber = bound(1, d->currententitynumber, prog->max_edicts - 1);
+ MSG_WriteShort(msg, startnumber);
+ // reset currententitynumber so if the loop does not break it we will
+ // start at beginning next frame (if it does break, it will set it)
+ d->currententitynumber = 1;
+ for (i = 0, n = startnumber;n < prog->max_edicts;n++)
{
- bits |= E5_ISACTIVE;
- if (changedbits & E5_ORIGIN)
+ // find the old state to delta from
+ e = EntityFrame4_GetReferenceEntity(d, n);
+ // prepare the buffer
+ 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++);
+ // make the message
+ s = states + i;
+ if (s->number == n)
{
- bits |= E5_ORIGIN;
- if (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;
+ // build the update
+ EntityState_WriteUpdate(s, &buf, e);
}
- if (changedbits & E5_ANGLES)
+ else
{
- bits |= E5_ANGLES;
- if (!(s->flags & RENDERFLAGS_LOWPRECISION))
- bits |= E5_ANGLES16;
+ inactiveentitystate.number = n;
+ s = &inactiveentitystate;
+ if (e->active)
+ {
+ // entity used to exist but doesn't anymore, send remove
+ MSG_WriteShort(&buf, n | 0x8000);
+ }
}
- if (changedbits & E5_MODEL)
+ // if the commit is full, we're done this frame
+ if (msg->cursize + buf.cursize > msg->maxsize - 4)
{
- bits |= E5_MODEL;
- if (s->modelindex >= 256)
- bits |= E5_MODEL16;
+ // next frame we will continue where we left off
+ break;
}
- if (changedbits & E5_FRAME)
+ // add the entity to the commit
+ EntityFrame4_AddCommitEntity(d, s);
+ // if the message is empty, skip out now
+ if (buf.cursize)
{
- bits |= E5_FRAME;
- if (s->frame >= 256)
- bits |= E5_FRAME16;
+ // write the message to the packet
+ SZ_Write(msg, buf.data, buf.cursize);
}
- if (changedbits & E5_SKIN)
- bits |= E5_SKIN;
- if (changedbits & E5_EFFECTS)
+ }
+ d->currententitynumber = n;
+
+ // remove world message (invalid, and thus a good terminator)
+ MSG_WriteShort(msg, 0x8000);
+ // write the number of the end entity
+ MSG_WriteShort(msg, d->currententitynumber);
+ // just to be sure
+ d->currentcommit = NULL;
+}
+
+
+
+
+#define E5_PROTOCOL_PRIORITYLEVELS 32
+
+entityframe5_database_t *EntityFrame5_AllocDatabase(mempool_t *pool)
+{
+ entityframe5_database_t *d;
+ d = Mem_Alloc(pool, sizeof(*d));
+ EntityFrame5_ResetDatabase(d);
+ return d;
+}
+
+void EntityFrame5_FreeDatabase(entityframe5_database_t *d)
+{
+ // all the [maxedicts] memory is allocated at once, so there's only one
+ // thing to free
+ if (d->maxedicts)
+ Mem_Free(d->deltabits);
+ Mem_Free(d);
+}
+
+void EntityFrame5_ResetDatabase(entityframe5_database_t *d)
+{
+ int i;
+ memset(d, 0, sizeof(*d));
+ d->latestframenum = 0;
+ for (i = 0;i < d->maxedicts;i++)
+ d->states[i] = defaultstate;
+}
+
+void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
+{
+ if (d->maxedicts < newmax)
+ {
+ qbyte *data;
+ int oldmaxedicts = d->maxedicts;
+ int *olddeltabits = d->deltabits;
+ qbyte *oldpriorities = d->priorities;
+ int *oldupdateframenum = d->updateframenum;
+ entity_state_t *oldstates = d->states;
+ qbyte *oldvisiblebits = d->visiblebits;
+ d->maxedicts = newmax;
+ data = Mem_Alloc(sv_mempool, d->maxedicts * sizeof(int) + d->maxedicts * sizeof(qbyte) + d->maxedicts * sizeof(int) + d->maxedicts * sizeof(entity_state_t) + (d->maxedicts+7)/8 * sizeof(qbyte));
+ d->deltabits = (void *)data;data += d->maxedicts * sizeof(int);
+ d->priorities = (void *)data;data += d->maxedicts * sizeof(qbyte);
+ d->updateframenum = (void *)data;data += d->maxedicts * sizeof(int);
+ d->states = (void *)data;data += d->maxedicts * sizeof(entity_state_t);
+ d->visiblebits = (void *)data;data += (d->maxedicts+7)/8 * sizeof(qbyte);
+ if (oldmaxedicts)
{
- bits |= E5_EFFECTS;
- if (s->modelindex >= 256)
- bits |= E5_MODEL16;
+ memcpy(d->deltabits, olddeltabits, oldmaxedicts * sizeof(int));
+ memcpy(d->priorities, oldpriorities, oldmaxedicts * sizeof(qbyte));
+ memcpy(d->updateframenum, oldupdateframenum, oldmaxedicts * sizeof(int));
+ memcpy(d->states, oldstates, oldmaxedicts * sizeof(entity_state_t));
+ memcpy(d->visiblebits, oldvisiblebits, (oldmaxedicts+7)/8 * sizeof(qbyte));
+ // the previous buffers were a single allocation, so just one free
+ Mem_Free(olddeltabits);
+ }
+ }
+}
+
+int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
+{
+ int lowprecision, limit, priority;
+ double distance;
+ int changedbits;
+ int age;
+ entity_state_t *view, *s;
+ changedbits = d->deltabits[stateindex];
+ if (!changedbits)
+ return 0;
+ if (!d->states[stateindex].active/* && changedbits & E5_FULLUPDATE*/)
+ return E5_PROTOCOL_PRIORITYLEVELS - 1;
+ // check whole attachment chain to judge relevance to player
+ view = d->states + d->viewentnum;
+ lowprecision = false;
+ for (limit = 0;limit < 256;limit++)
+ {
+ if (d->maxedicts < stateindex)
+ EntityFrame5_ExpandEdicts(d, (stateindex+256)&~255);
+ s = d->states + stateindex;
+ if (s == view)
+ return E5_PROTOCOL_PRIORITYLEVELS - 1;
+ if (s->flags & RENDER_VIEWMODEL)
+ return E5_PROTOCOL_PRIORITYLEVELS - 1;
+ if (s->flags & RENDER_LOWPRECISION)
+ lowprecision = true;
+ if (!s->tagentity)
+ {
+ if (VectorCompare(s->origin, view->origin))
+ return E5_PROTOCOL_PRIORITYLEVELS - 1;
+ break;
+ }
+ stateindex = s->tagentity;
+ }
+ if (limit >= 256)
+ {
+ Con_Printf("Protocol: Runaway loop recursing tagentity links on entity %i\n", stateindex);
+ return 0;
+ }
+ // it's not a viewmodel for this client
+ distance = VectorDistance(view->origin, s->origin);
+ age = d->latestframenum - d->updateframenum[stateindex];
+ priority = (E5_PROTOCOL_PRIORITYLEVELS / 2) + age - (int)(distance * (E5_PROTOCOL_PRIORITYLEVELS / 16384.0f));
+ if (lowprecision)
+ priority -= (E5_PROTOCOL_PRIORITYLEVELS / 4);
+ //if (changedbits & E5_FULLUPDATE)
+ // priority += 4;
+ //if (changedbits & (E5_ATTACHMENT | E5_MODEL | E5_FLAGS | E5_COLORMAP))
+ // priority += 4;
+ return (int) bound(1, priority, E5_PROTOCOL_PRIORITYLEVELS - 1);
+}
+
+void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg)
+{
+ unsigned int bits = 0;
+ if (!s->active)
+ MSG_WriteShort(msg, number | 0x8000);
+ 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))
+ bits |= E5_ORIGIN32;
+ if ((bits & E5_ANGLES) && !(s->flags & RENDER_LOWPRECISION))
+ bits |= E5_ANGLES16;
+ if ((bits & E5_MODEL) && s->modelindex >= 256)
+ bits |= E5_MODEL16;
+ if ((bits & E5_FRAME) && s->frame >= 256)
+ bits |= E5_FRAME16;
+ if (bits & E5_EFFECTS)
+ {
+ if (s->effects >= 65536)
+ bits |= E5_EFFECTS32;
+ else if (s->effects >= 256)
+ bits |= E5_EFFECTS16;
}
- if (changedbits & E5_FLAGS)
- bits |= E5_FLAGS;
- if (changedbits & E5_ALPHA)
- bits |= E5_ALPHA;
- if (changedbits & E5_SCALE)
- bits |= E5_SCALE;
- if (changedbits & E5_ATTACHMENT)
- bits |= E5_ATTACHMENT;
- if (changedbits & E5_EXTERIORFORENTITY)
- bits |= E5_EXTERIORFORENTITY;
- if (changedbits & E5_LIGHT)
- bits |= E5_LIGHT;
- if (changedbits & E5_COLORMAP)
- bits |= E5_COLORMAP;
- if (changedbits & E5_GLOW)
- bits |= E5_GLOW;
if (bits >= 256)
bits |= E5_EXTEND1;
if (bits >= 65536)
{
if (bits & E5_ORIGIN32)
{
- MSG_WriteFloat(msg, s->origin[0]);
- MSG_WriteFloat(msg, s->origin[1]);
- MSG_WriteFloat(msg, s->origin[2]);
+ MSG_WriteCoord32f(msg, s->origin[0]);
+ MSG_WriteCoord32f(msg, s->origin[1]);
+ MSG_WriteCoord32f(msg, s->origin[2]);
}
else
{
- MSG_WriteShort(msg, (int)floor(s->origin[0] * 8 + 0.5f));
- MSG_WriteShort(msg, (int)floor(s->origin[1] * 8 + 0.5f));
- MSG_WriteShort(msg, (int)floor(s->origin[2] * 8 + 0.5f));
+ MSG_WriteCoord13i(msg, s->origin[0]);
+ MSG_WriteCoord13i(msg, s->origin[1]);
+ MSG_WriteCoord13i(msg, s->origin[2]);
}
}
if (bits & E5_ANGLES)
{
if (bits & E5_ANGLES16)
{
- MSG_WriteShort(msg, (int)floor(s->angles[0] * (65536.0f / 360.0f) + 0.5f));
- MSG_WriteShort(msg, (int)floor(s->angles[1] * (65536.0f / 360.0f) + 0.5f));
- MSG_WriteShort(msg, (int)floor(s->angles[2] * (65536.0f / 360.0f) + 0.5f));
+ MSG_WriteAngle16i(msg, s->angles[0]);
+ MSG_WriteAngle16i(msg, s->angles[1]);
+ MSG_WriteAngle16i(msg, s->angles[2]);
}
else
{
- MSG_WriteByte(msg, (int)floor(s->angles[0] * (256.0f / 360.0f) + 0.5f));
- MSG_WriteByte(msg, (int)floor(s->angles[1] * (256.0f / 360.0f) + 0.5f));
- MSG_WriteByte(msg, (int)floor(s->angles[2] * (256.0f / 360.0f) + 0.5f));
+ MSG_WriteAngle8i(msg, s->angles[0]);
+ MSG_WriteAngle8i(msg, s->angles[1]);
+ MSG_WriteAngle8i(msg, s->angles[2]);
}
}
if (bits & E5_MODEL)
MSG_WriteByte(msg, s->frame);
}
if (bits & E5_SKIN)
- MSG_WriteByte(msg, s->flags);
+ MSG_WriteByte(msg, s->skin);
if (bits & E5_EFFECTS)
{
if (bits & E5_EFFECTS32)
MSG_WriteByte(msg, s->effects);
}
if (bits & E5_ALPHA)
- MSG_WriteByte(msg, s->flags);
+ MSG_WriteByte(msg, s->alpha);
if (bits & E5_SCALE)
- MSG_WriteByte(msg, s->flags);
+ MSG_WriteByte(msg, s->scale);
+ if (bits & E5_COLORMAP)
+ MSG_WriteByte(msg, s->colormap);
if (bits & E5_ATTACHMENT)
{
MSG_WriteShort(msg, s->tagentity);
MSG_WriteByte(msg, s->tagindex);
}
- if (bits & E5_EXTERIORFORENTITY)
- MSG_WriteShort(msg, s->tagentity);
if (bits & E5_LIGHT)
{
MSG_WriteShort(msg, s->light[0]);
MSG_WriteShort(msg, s->light[1]);
MSG_WriteShort(msg, s->light[2]);
MSG_WriteShort(msg, s->light[3]);
+ MSG_WriteByte(msg, s->lightstyle);
+ MSG_WriteByte(msg, s->lightpflags);
}
- if (bits & E5_COLORMAP)
- MSG_WriteByte(msg, s->colormap);
if (bits & E5_GLOW)
{
MSG_WriteByte(msg, s->glowsize);
MSG_WriteByte(msg, s->glowcolor);
}
+ if (bits & E5_COLORMOD)
+ {
+ MSG_WriteByte(msg, s->colormod[0]);
+ MSG_WriteByte(msg, s->colormod[1]);
+ MSG_WriteByte(msg, s->colormod[2]);
+ }
}
}
-int EntityFrame5_ReadUpdate(void)
+void EntityState5_ReadUpdate(entity_state_t *s)
{
- number = MSG_ReadShort();
- e = cl_entities + (number & 0x7FFF);
- e->state_previous = e->state_current;
- if (number & 0x8000)
+ int bits;
+ bits = MSG_ReadByte();
+ if (bits & E5_EXTEND1)
{
- if (number == 0x8000)
+ bits |= MSG_ReadByte() << 8;
+ if (bits & E5_EXTEND2)
{
- // end of entity list
- return false;
+ bits |= MSG_ReadByte() << 16;
+ if (bits & E5_EXTEND3)
+ bits |= MSG_ReadByte() << 24;
}
- // remove
- number &= 0x7FFF;
- e->state_current = defaultstate;
- e->state_current.number = number;
- return true;
}
- else
+ if (bits & E5_FULLUPDATE)
{
+ *s = defaultstate;
+ s->active = true;
+ }
+ if (bits & E5_FLAGS)
+ s->flags = MSG_ReadByte();
+ if (bits & E5_ORIGIN)
+ {
+ if (bits & E5_ORIGIN32)
+ {
+ s->origin[0] = MSG_ReadCoord32f();
+ s->origin[1] = MSG_ReadCoord32f();
+ s->origin[2] = MSG_ReadCoord32f();
+ }
+ else
+ {
+ s->origin[0] = MSG_ReadCoord13i();
+ s->origin[1] = MSG_ReadCoord13i();
+ s->origin[2] = MSG_ReadCoord13i();
+ }
+ }
+ if (bits & E5_ANGLES)
+ {
+ if (bits & E5_ANGLES16)
+ {
+ s->angles[0] = MSG_ReadAngle16i();
+ s->angles[1] = MSG_ReadAngle16i();
+ s->angles[2] = MSG_ReadAngle16i();
+ }
+ else
+ {
+ s->angles[0] = MSG_ReadAngle8i();
+ s->angles[1] = MSG_ReadAngle8i();
+ s->angles[2] = MSG_ReadAngle8i();
+ }
+ }
+ if (bits & E5_MODEL)
+ {
+ if (bits & E5_MODEL16)
+ s->modelindex = (unsigned short) MSG_ReadShort();
+ else
+ s->modelindex = MSG_ReadByte();
+ }
+ if (bits & E5_FRAME)
+ {
+ if (bits & E5_FRAME16)
+ s->frame = (unsigned short) MSG_ReadShort();
+ else
+ s->frame = MSG_ReadByte();
+ }
+ if (bits & E5_SKIN)
+ s->skin = MSG_ReadByte();
+ if (bits & E5_EFFECTS)
+ {
+ if (bits & E5_EFFECTS32)
+ s->effects = (unsigned int) MSG_ReadLong();
+ else if (bits & E5_EFFECTS16)
+ s->effects = (unsigned short) MSG_ReadShort();
+ else
+ s->effects = MSG_ReadByte();
+ }
+ if (bits & E5_ALPHA)
+ s->alpha = MSG_ReadByte();
+ if (bits & E5_SCALE)
+ s->scale = MSG_ReadByte();
+ if (bits & E5_COLORMAP)
+ s->colormap = MSG_ReadByte();
+ if (bits & E5_ATTACHMENT)
+ {
+ s->tagentity = (unsigned short) MSG_ReadShort();
+ s->tagindex = MSG_ReadByte();
+ }
+ if (bits & E5_LIGHT)
+ {
+ s->light[0] = (unsigned short) MSG_ReadShort();
+ s->light[1] = (unsigned short) MSG_ReadShort();
+ s->light[2] = (unsigned short) MSG_ReadShort();
+ s->light[3] = (unsigned short) MSG_ReadShort();
+ s->lightstyle = MSG_ReadByte();
+ s->lightpflags = MSG_ReadByte();
+ }
+ if (bits & E5_GLOW)
+ {
+ s->glowsize = MSG_ReadByte();
+ s->glowcolor = MSG_ReadByte();
+ }
+ if (bits & E5_COLORMOD)
+ {
+ s->colormod[0] = MSG_ReadByte();
+ s->colormod[1] = MSG_ReadByte();
+ s->colormod[2] = MSG_ReadByte();
+ }
+
+
+ if (developer_networkentities.integer >= 2)
+ {
+ Con_Printf("ReadFields e%i", s->number);
+
+ if (bits & E5_ORIGIN)
+ Con_Printf(" E5_ORIGIN %f %f %f", s->origin[0], s->origin[1], s->origin[2]);
+ if (bits & E5_ANGLES)
+ Con_Printf(" E5_ANGLES %f %f %f", s->angles[0], s->angles[1], s->angles[2]);
+ if (bits & E5_MODEL)
+ Con_Printf(" E5_MODEL %i", s->modelindex);
+ if (bits & E5_FRAME)
+ Con_Printf(" E5_FRAME %i", s->frame);
+ if (bits & E5_SKIN)
+ Con_Printf(" E5_SKIN %i", s->skin);
+ if (bits & E5_EFFECTS)
+ Con_Printf(" E5_EFFECTS %i", s->effects);
+ if (bits & E5_FLAGS)
+ {
+ Con_Printf(" E5_FLAGS %i (", s->flags);
+ if (s->flags & RENDER_STEP)
+ Con_Print(" STEP");
+ if (s->flags & RENDER_GLOWTRAIL)
+ Con_Print(" GLOWTRAIL");
+ if (s->flags & RENDER_VIEWMODEL)
+ Con_Print(" VIEWMODEL");
+ if (s->flags & RENDER_EXTERIORMODEL)
+ Con_Print(" EXTERIORMODEL");
+ if (s->flags & RENDER_LOWPRECISION)
+ Con_Print(" LOWPRECISION");
+ if (s->flags & RENDER_COLORMAPPED)
+ Con_Print(" COLORMAPPED");
+ if (s->flags & RENDER_SHADOW)
+ Con_Print(" SHADOW");
+ if (s->flags & RENDER_LIGHT)
+ Con_Print(" LIGHT");
+ Con_Print(")");
+ }
+ if (bits & E5_ALPHA)
+ Con_Printf(" E5_ALPHA %f", s->alpha / 255.0f);
+ if (bits & E5_SCALE)
+ Con_Printf(" E5_SCALE %f", s->scale / 16.0f);
+ if (bits & E5_COLORMAP)
+ Con_Printf(" E5_COLORMAP %i", s->colormap);
+ if (bits & E5_ATTACHMENT)
+ Con_Printf(" E5_ATTACHMENT e%i:%i", s->tagentity, s->tagindex);
+ if (bits & E5_LIGHT)
+ Con_Printf(" E5_LIGHT %i:%i:%i:%i %i:%i", s->light[0], s->light[1], s->light[2], s->light[3], s->lightstyle, s->lightpflags);
+ if (bits & E5_GLOW)
+ Con_Printf(" E5_GLOW %i:%i", s->glowsize * 4, s->glowcolor);
+ if (bits & E5_COLORMOD)
+ Con_Printf(" E5_COLORMOD %f:%f:%f", s->colormod[0] / 32.0f, s->colormod[1] / 32.0f, s->colormod[2] / 32.0f);
+ Con_Print("\n");
}
}
-int cl_entityframe5_lastreceivedframenum;
+int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n)
+{
+ unsigned int bits = 0;
+ if (n->active)
+ {
+ if (!o->active)
+ bits |= E5_FULLUPDATE;
+ if (!VectorCompare(o->origin, n->origin))
+ bits |= E5_ORIGIN;
+ if (!VectorCompare(o->angles, n->angles))
+ bits |= E5_ANGLES;
+ if (o->modelindex != n->modelindex)
+ bits |= E5_MODEL;
+ if (o->frame != n->frame)
+ bits |= E5_FRAME;
+ if (o->skin != n->skin)
+ bits |= E5_SKIN;
+ if (o->effects != n->effects)
+ bits |= E5_EFFECTS;
+ if (o->flags != n->flags)
+ bits |= E5_FLAGS;
+ if (o->alpha != n->alpha)
+ bits |= E5_ALPHA;
+ if (o->scale != n->scale)
+ bits |= E5_SCALE;
+ if (o->colormap != n->colormap)
+ bits |= E5_COLORMAP;
+ if (o->tagentity != n->tagentity || o->tagindex != n->tagindex)
+ bits |= E5_ATTACHMENT;
+ if (o->light[0] != n->light[0] || o->light[1] != n->light[1] || o->light[2] != n->light[2] || o->light[3] != n->light[3] || o->lightstyle != n->lightstyle || o->lightpflags != n->lightpflags)
+ bits |= E5_LIGHT;
+ if (o->glowsize != n->glowsize || o->glowcolor != n->glowcolor)
+ bits |= E5_GLOW;
+ if (o->colormod[0] != n->colormod[0] || o->colormod[1] != n->colormod[1] || o->colormod[2] != n->colormod[2])
+ bits |= E5_COLORMOD;
+ }
+ else
+ if (o->active)
+ bits |= E5_FULLUPDATE;
+ return bits;
+}
void EntityFrame5_CL_ReadFrame(void)
{
- int n, enumber;
+ int i, n, enumber;
entity_t *ent;
entity_state_t *s;
// read the number of this frame to echo back in next input packet
- cl_entityframe5_lastreceivedframenum = MSG_ReadLong();
+ for (i = 0;i < LATESTFRAMENUMS-1;i++)
+ cl.latestframenums[i] = cl.latestframenums[i+1];
+ cl.latestframenums[LATESTFRAMENUMS-1] = MSG_ReadLong();
+ if (cl.protocol != PROTOCOL_QUAKE && cl.protocol != PROTOCOL_QUAKEDP && cl.protocol != PROTOCOL_NEHAHRAMOVIE && cl.protocol != PROTOCOL_DARKPLACES1 && cl.protocol != PROTOCOL_DARKPLACES2 && cl.protocol != PROTOCOL_DARKPLACES3 && cl.protocol != PROTOCOL_DARKPLACES4 && cl.protocol != PROTOCOL_DARKPLACES5 && cl.protocol != PROTOCOL_DARKPLACES6)
+ cl.servermovesequence = MSG_ReadLong();
// read entity numbers until we find a 0x8000
// (which would be remove world entity, but is actually a terminator)
- while ((n = MSG_ReadShort()) != 0x8000)
+ while ((n = (unsigned short)MSG_ReadShort()) != 0x8000 && !msg_badread)
{
- // get the entity number and look it up
+ // get the entity number
enumber = n & 0x7FFF;
+ // we may need to expand the array
+ if (cl_num_entities <= enumber)
+ {
+ cl_num_entities = enumber + 1;
+ if (enumber >= cl_max_entities)
+ CL_ExpandEntities(enumber);
+ }
+ // look up the entity
ent = cl_entities + enumber;
// slide the current into the previous slot
ent->state_previous = ent->state_current;
else
{
// update entity
- s->active = true;
- EntityState_ReadFields(s, EntityState_ReadExtendBits());
+ EntityState5_ReadUpdate(s);
}
// set the cl_entities_active flag
cl_entities_active[enumber] = s->active;
}
}
-#define ENTITYFRAME5_MAXPACKETLOGS 64
-#define ENTITYFRAME5_MAXSTATES 128
-
-typedef struct entityframe5_state_s
-{
- unsigned short entitynumber;
- qbyte active;
- qbyte activedirtybit;
- int dirtybits;
-}
-entityframe5_state_t;
-
-typedef struct entityframe5_packetlog_s
-{
- int packetnumber;
- int numstates;
- entityframe5_state_t states[ENTITYFRAME5_MAXSTATES];
-}
-entityframe5_packetlog_t;
-
-typedef struct entityframe5_s
-{
- int ackedframenum;
- entityframe5_packetlog_t packetlog[ENTITYFRAME5_MAXPACKETLOGS];
- qbyte activedirtybits[(MAX_EDICTS + 7) / 8];
- int dirtybits[MAX_EDICTS];
-}
-entityframe5_t;
-
-void EntityFrame5_AckFrame(entityframe5_t *d, int framenum)
+void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum)
{
- int i, j, k, l, dirtybits, activedirtybit;
- entityframe5_state_t *s, *s2;
+ int i, j, k, l, bits;
+ entityframe5_changestate_t *s, *s2;
entityframe5_packetlog_t *p, *p2;
- if (framenum >= d->ackedframenum)
- return;
- d->ackedframenum = framenum;
- // scan for packets made obsolete by this ack
+ qbyte statsdeltabits[(MAX_CL_STATS+7)/8];
+ // scan for packets that were lost
for (i = 0, p = d->packetlog;i < ENTITYFRAME5_MAXPACKETLOGS;i++, p++)
{
- // skip packets that are empty or in the future
- if (p->packetnumber == 0 || p->packetnumber > framenum)
- continue;
- // if the packetnumber matches it is deleted without any processing
- // (since it was received).
- // if the packet number is less than this ack it was lost and its
- // important information will be repeated in this update if it is not
- // already obsolete due to a later update.
- if (p->packetnumber < framenum)
- {
- // packet was lost - merge dirtybits into the main array so they
+ if (p->packetnumber && p->packetnumber <= framenum)
+ {
+ // packet was lost - merge deltabits into the main array so they
// will be re-sent, but only if there is no newer update of that
// bit in the logs (as those will arrive before this update)
for (j = 0, s = p->states;j < p->numstates;j++, s++)
{
- activedirtybit = s->activedirtybit;
- dirtybits = s->dirtybits;
- // check for any newer updates to this entity
- for (k = 0, p2 = d->packetlog;k < ENTITYFRAME5_MAXPACKETLOGS;k++, p2++)
+ // check for any newer updates to this entity and mask off any
+ // overlapping bits (we don't need to send something again if
+ // it has already been sent more recently)
+ bits = s->bits & ~d->deltabits[s->number];
+ for (k = 0, p2 = d->packetlog;k < ENTITYFRAME5_MAXPACKETLOGS && bits;k++, p2++)
{
if (p2->packetnumber > framenum)
{
- for (l = 0, s2 = p2->states;l < p2->numstates;l++, p2++)
+ for (l = 0, s2 = p2->states;l < p2->numstates;l++, s2++)
{
- if (s2->entitynumber == s->entitynumber)
+ if (s2->number == s->number)
{
- activedirtybit &= ~s2->activedirtybit;
- dirtybits &= ~s2->dirtybits;
+ bits &= ~s2->bits;
break;
}
}
- if (!activedirtybit && !dirtybits)
- break;
}
}
// if the bits haven't all been cleared, there were some bits
// lost with this packet, so set them again now
- if (activedirtybit)
- d->activedirtybits[s->entitynumber / 8] |= 1 << (s->entitynumber & 7);
- if (dirtybits)
- d->dirtybits[s->entitynumber] |= dirtybits;
+ if (bits)
+ d->deltabits[s->number] |= bits;
+ }
+ // mark lost stats
+ 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];
+ 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];
}
+ // delete this packet log as it is now obsolete
+ p->packetnumber = 0;
}
- // delete this packet log as it is now obsolete
- p->packetnumber = 0;
}
}
-void EntityFrame5_WriteFrame(sizebuf_t *msg, int numstates, entity_state_t *states)
+void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum)
{
+ int i;
+ // scan for packets made obsolete by this ack and delete them
+ for (i = 0;i < ENTITYFRAME5_MAXPACKETLOGS;i++)
+ if (d->packetlog[i].packetnumber <= framenum)
+ d->packetlog[i].packetnumber = 0;
+}
+
+int entityframe5_prioritychaincounts[E5_PROTOCOL_PRIORITYLEVELS];
+unsigned short entityframe5_prioritychains[E5_PROTOCOL_PRIORITYLEVELS][ENTITYFRAME5_MAXSTATES];
+
+void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int *stats, int movesequence)
+{
+ const entity_state_t *n;
+ int i, num, l, framenum, packetlognumber, priority;
+ sizebuf_t buf;
+ qbyte data[128];
+ entityframe5_packetlog_t *packetlog;
+
+ if (prog->max_edicts > d->maxedicts)
+ EntityFrame5_ExpandEdicts(d, prog->max_edicts);
+
+ framenum = d->latestframenum + 1;
+ d->viewentnum = viewentnum;
+
+ // if packet log is full, mark all frames as lost, this will cause
+ // it to send the lost data again
+ for (packetlognumber = 0;packetlognumber < ENTITYFRAME5_MAXPACKETLOGS;packetlognumber++)
+ if (d->packetlog[packetlognumber].packetnumber == 0)
+ break;
+ if (packetlognumber == ENTITYFRAME5_MAXPACKETLOGS)
+ {
+ Con_DPrintf("EntityFrame5_WriteFrame: packetlog overflow for a client, resetting\n");
+ EntityFrame5_LostFrame(d, framenum);
+ packetlognumber = 0;
+ }
+
+ // prepare the buffer
+ memset(&buf, 0, sizeof(buf));
+ 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;
+ for (i = 0, n = states;i < numstates;i++, n++)
+ {
+ // mark gaps in entity numbering as removed entities
+ for (;num < n->number;num++)
+ {
+ // if the entity used to exist, clear it
+ if (CHECKPVSBIT(d->visiblebits, num))
+ {
+ CLEARPVSBIT(d->visiblebits, num);
+ d->deltabits[num] = E5_FULLUPDATE;
+ d->priorities[num] = EntityState5_Priority(d, num);
+ d->states[num] = defaultstate;
+ d->states[num].number = num;
+ }
+ }
+ // update the entity state data
+ if (!CHECKPVSBIT(d->visiblebits, num))
+ {
+ // entity just spawned in, don't let it completely hog priority
+ // because of being ancient on the first frame
+ d->updateframenum[num] = framenum;
+ }
+ SETPVSBIT(d->visiblebits, num);
+ d->deltabits[num] |= EntityState5_DeltaBits(d->states + num, n);
+ d->priorities[num] = EntityState5_Priority(d, num);
+ d->states[num] = *n;
+ d->states[num].number = num;
+ // advance to next entity so the next iteration doesn't immediately remove it
+ num++;
+ }
+ // all remaining entities are dead
+ for (;num < d->maxedicts;num++)
+ {
+ if (CHECKPVSBIT(d->visiblebits, num))
+ {
+ CLEARPVSBIT(d->visiblebits, num);
+ d->deltabits[num] = E5_FULLUPDATE;
+ d->priorities[num] = EntityState5_Priority(d, num);
+ d->states[num] = defaultstate;
+ d->states[num].number = num;
+ }
+ }
+
+ // if there isn't at least enough room for an empty svc_entities,
+ // don't bother trying...
+ if (buf.cursize + 11 > buf.maxsize)
+ return;
+
+ // build lists of entities by priority level
+ memset(entityframe5_prioritychaincounts, 0, sizeof(entityframe5_prioritychaincounts));
+ l = 0;
+ for (num = 0;num < d->maxedicts;num++)
+ {
+ if (d->priorities[num])
+ {
+ l = num;
+ priority = d->priorities[num];
+ if (entityframe5_prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES)
+ entityframe5_prioritychains[priority][entityframe5_prioritychaincounts[priority]++] = num;
+ }
+ }
+
+ // add packetlog entry
+ packetlog = d->packetlog + packetlognumber;
+ packetlog->packetnumber = framenum;
+ packetlog->numstates = 0;
+ // write stat updates
+ 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)
+ {
+ for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= msg->maxsize;i++)
+ {
+ if (d->statsdeltabits[i>>3] & (1<<(i&7)))
+ {
+ d->statsdeltabits[i>>3] &= ~(1<<(i&7));
+ packetlog->statsdeltabits[i>>3] |= (1<<(i&7));
+ if (d->stats[i] >= 0 && d->stats[i] < 256)
+ {
+ MSG_WriteByte(msg, svc_updatestatubyte);
+ MSG_WriteByte(msg, i);
+ MSG_WriteByte(msg, d->stats[i]);
+ }
+ else
+ {
+ MSG_WriteByte(msg, svc_updatestat);
+ MSG_WriteByte(msg, i);
+ MSG_WriteLong(msg, d->stats[i]);
+ }
+ }
+ }
+ }
+ // write state updates
+ 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 (i = 0;i < entityframe5_prioritychaincounts[priority] && packetlog->numstates < ENTITYFRAME5_MAXSTATES;i++)
+ {
+ num = entityframe5_prioritychains[priority][i];
+ n = d->states + num;
+ if (d->deltabits[num] & E5_FULLUPDATE)
+ d->deltabits[num] = E5_FULLUPDATE | EntityState5_DeltaBits(&defaultstate, n);
+ buf.cursize = 0;
+ EntityState5_WriteUpdate(num, n, d->deltabits[num], &buf);
+ // if the entity won't fit, try the next one
+ if (msg->cursize + buf.cursize + 2 > msg->maxsize)
+ continue;
+ // write entity to the packet
+ SZ_Write(msg, buf.data, buf.cursize);
+ // mark age on entity for prioritization
+ d->updateframenum[num] = framenum;
+ // log entity so deltabits can be restored later if lost
+ packetlog->states[packetlog->numstates].number = num;
+ packetlog->states[packetlog->numstates].bits = d->deltabits[num];
+ packetlog->numstates++;
+ // clear deltabits and priority so it won't be sent again
+ d->deltabits[num] = 0;
+ d->priorities[num] = 0;
+ }
+ }
+ MSG_WriteShort(msg, 0x8000);
}
-*/