X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=protocol.c;h=72870b34f993215e813dce91c2bcd8d741012200;hp=2d288522b321e92e38ad87ae0d156625e5762094;hb=435b52972823fa8e8ceb9b67797ca3f886f6208a;hpb=0841c42bd9fc1ca23046a7adfe765732b99b744f

diff --git a/protocol.c b/protocol.c
index 2d288522..72870b34 100644
--- a/protocol.c
+++ b/protocol.c
@@ -4,39 +4,277 @@
 // 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;
+	255,//unsigned char colormod;
 	// padding to a multiple of 8 bytes (to align the double time)
-	{0,0,0,0,0}//unsigned char unused[5];
+	{0,0,0,0}//unsigned char unused[4]; // !
 };
 
-void ClearStateToDefault(entity_state_t *s)
+double entityframequake_mtime = 0;
+
+void EntityFrameQuake_ReadEntity(int bits)
 {
-	*s = defaultstate;
+	int num;
+	entity_t *ent;
+	entity_state_t s;
+
+	entityframequake_mtime = cl.mtime[0];
+
+	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);
+
+	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;
+	}
+
+	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_ReadCoord13i();
+	if (bits & U_ANGLE1)	s.angles[0] = MSG_ReadAngle8i();
+	if (bits & U_ORIGIN2)	s.origin[1] = MSG_ReadCoord13i();
+	if (bits & U_ANGLE2)	s.angles[1] = MSG_ReadAngle8i();
+	if (bits & U_ORIGIN3)	s.origin[2] = MSG_ReadCoord13i();
+	if (bits & U_ANGLE3)	s.angles[2] = MSG_ReadAngle8i();
+	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)	s.colormod = MSG_ReadByte();
+	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 i;
+	for (i = 0;i < cl_max_entities;i++)
+	{
+		if (cl_entities_active[i] && cl_entities[i].state_current.time != cl.mtime[0])
+		{
+			cl_entities_active[i] = false;
+			cl_entities[i].state_current = defaultstate;
+			cl_entities[i].state_current.number = i;
+		}
+	}
+}
+
+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 = sv.edicts[s->number].e->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.netquakecompatible)
+			bits &= 0x7FFF;
+
+		// 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_WriteCoord13i(&buf, s->origin[0]);
+		if (bits & U_ANGLE1)		MSG_WriteAngle8i(&buf, s->angles[0]);
+		if (bits & U_ORIGIN2)		MSG_WriteCoord13i(&buf, s->origin[1]);
+		if (bits & U_ANGLE2)		MSG_WriteAngle8i(&buf, s->angles[1]);
+		if (bits & U_ORIGIN3)		MSG_WriteCoord13i(&buf, s->origin[2]);
+		if (bits & U_ANGLE3)		MSG_WriteAngle8i(&buf, s->angles[2]);
+		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)		MSG_WriteByte(&buf, s->colormod);
+		if (bits & U_FRAME2)		MSG_WriteByte(&buf, s->frame >> 8);
+		if (bits & U_MODEL2)		MSG_WriteByte(&buf, s->modelindex >> 8);
+
+		// 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)
@@ -120,40 +358,58 @@ void EntityState_WriteExtendBits(sizebuf_t *msg, unsigned int bits)
 	}
 }
 
-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 if (sv.protocol == PROTOCOL_DARKPLACES1 || sv.protocol == PROTOCOL_DARKPLACES3 || sv.protocol == PROTOCOL_DARKPLACES4 || sv.protocol == PROTOCOL_DARKPLACES5)
+	{
+		// 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_DARKPLACES5 && !(ent->flags & RENDER_LOWPRECISION))
+	{
 		if (bits & E_ANGLE1)
-			MSG_WriteAngle(msg, ent->angles[0]);
+			MSG_WriteAngle16i(msg, ent->angles[0]);
 		if (bits & E_ANGLE2)
-			MSG_WriteAngle(msg, ent->angles[1]);
+			MSG_WriteAngle16i(msg, ent->angles[1]);
 		if (bits & E_ANGLE3)
-			MSG_WriteAngle(msg, ent->angles[2]);
+			MSG_WriteAngle16i(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_WriteAngle8i(msg, ent->angles[0]);
 		if (bits & E_ANGLE2)
-			MSG_WritePreciseAngle(msg, ent->angles[1]);
+			MSG_WriteAngle8i(msg, ent->angles[1]);
 		if (bits & E_ANGLE3)
-			MSG_WritePreciseAngle(msg, ent->angles[2]);
+			MSG_WriteAngle8i(msg, ent->angles[2]);
 	}
 	if (bits & E_MODEL1)
 		MSG_WriteByte(msg, ent->modelindex & 0xFF);
@@ -179,6 +435,9 @@ void EntityState_WriteFields(entity_state_t *ent, sizebuf_t *msg, unsigned int b
 		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);
@@ -197,7 +456,7 @@ void EntityState_WriteFields(entity_state_t *ent, sizebuf_t *msg, unsigned int b
 		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)
@@ -244,52 +503,52 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits)
 	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
+	else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES3 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)
 	{
 		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 (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();
@@ -320,15 +579,15 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits)
 			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();
@@ -385,18 +644,30 @@ void EntityState_ReadFields(entity_state_t *e, unsigned int bits)
 	}
 }
 
+// (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;
+	if (d->ackframenum < 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)
@@ -414,27 +685,13 @@ void EntityFrame_Clear(entity_frame_t *f, vec3_t eye, int framenum)
 	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);
@@ -454,18 +711,18 @@ void EntityFrame_FetchFrame(entity_database_t *d, int framenum, entity_frame_t *
 }
 
 // (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);
@@ -473,14 +730,14 @@ void EntityFrame_AddFrame(entity_database_t *d, entity_frame_t *f)
 	}
 
 	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");
@@ -493,40 +750,54 @@ void EntityFrame_AddFrame(entity_database_t *d, entity_frame_t *f)
 		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, f);
+	EntityFrame_AddFrame(d, eye, d->latestframenum, numstates, states);
+
+	EntityFrame_FetchFrame(d, d->ackframenum > 0 ? d->ackframenum : -1, 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++)
 		{
@@ -557,11 +828,16 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 
 // (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_entities_mempool);
+	d = cl.entitydatabase;
 
 	EntityFrame_Clear(f, NULL, -1);
 
@@ -577,7 +853,7 @@ void EntityFrame_Read(entity_database_t *d)
 	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");
@@ -634,12 +910,42 @@ void EntityFrame_Read(entity_database_t *d)
 		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_max_entities * sizeof(qbyte));
+	number = 1;
+	for (i = 0;i < f->numentities;i++)
+	{
+		for (;number < f->entitydata[i].number;number++)
+		{
+			if (cl_entities_active[number])
+			{
+				cl_entities_active[number] = false;
+				cl_entities[number].state_current.active = false;
+			}
+		}
+		// 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_max_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;
@@ -652,7 +958,7 @@ int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
 
 
 
-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)
 	{
@@ -675,7 +981,7 @@ entity_state_t *EntityFrame4_GetReferenceEntity(entity_database4_t *d, int numbe
 	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)
@@ -692,9 +998,9 @@ void EntityFrame4_AddCommitEntity(entity_database4_t *d, entity_state_t *s)
 	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);
@@ -702,7 +1008,7 @@ entity_database4_t *EntityFrame4_AllocDatabase(mempool_t *pool)
 	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++)
@@ -713,7 +1019,7 @@ void EntityFrame4_FreeDatabase(entity_database4_t *d)
 	Mem_Free(d);
 }
 
-void EntityFrame4_ResetDatabase(entity_database4_t *d)
+void EntityFrame4_ResetDatabase(entityframe4_database_t *d)
 {
 	int i;
 	d->ackframenum = -1;
@@ -724,7 +1030,7 @@ void EntityFrame4_ResetDatabase(entity_database4_t *d)
 		d->referenceentity[i] = defaultstate;
 }
 
-int EntityFrame4_AckFrame(entity_database4_t *d, int framenum)
+int EntityFrame4_AckFrame(entityframe4_database_t *d, int framenum)
 {
 	int i, j, found;
 	entity_database4_commit_t *commit;
@@ -783,43 +1089,20 @@ int EntityFrame4_AckFrame(entity_database4_t *d, int 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_entities_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();
 	// 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);
@@ -931,77 +1214,198 @@ void EntityFrame4_CL_ReadFrame(entity_database4_t *d)
 		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 >= sv.max_edicts)
+		startnumber = 1;
 	else
+		startnumber = bound(1, d->currententitynumber, sv.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 < sv.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)
+{
+	Mem_Free(d);
+}
+
+void EntityFrame5_ResetDatabase(entityframe5_database_t *d)
+{
+	int i;
+	memset(d, 0, sizeof(*d));
+	d->latestframenum = 0;
+	d->ackframenum = -1;
+	for (i = 0;i < MAX_EDICTS;i++)
+		d->states[i] = defaultstate;
+}
+
+
+int EntityState5_Priority(entityframe5_database_t *d, entity_state_t *view, entity_state_t *s, int changedbits, int age)
+{
+	int lowprecision, limit, priority;
+	double distance;
+	if (!changedbits)
+		return 0;
+	if (!s->active/* && changedbits & E5_FULLUPDATE*/)
+		return E5_PROTOCOL_PRIORITYLEVELS - 1;
+	// check whole attachment chain to judge relevance to player
+	lowprecision = false;
+	for (limit = 0;limit < 256;limit++)
+	{
+		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)
 		{
-			bits |= E5_EFFECTS;
-			if (s->modelindex >= 256)
-				bits |= E5_MODEL16;
+			if (VectorCompare(s->origin, view->origin))
+				return E5_PROTOCOL_PRIORITYLEVELS - 1;
+			break;
+		}
+		s = d->states + s->tagentity;
+	}
+	if (limit >= 256)
+		Con_Printf("Protocol: Runaway loop recursing tagentity links on entity %i\n", s->number);
+	// it's not a viewmodel for this client
+	distance = VectorDistance(view->origin, s->origin);
+	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->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)
@@ -1022,30 +1426,30 @@ void EntityState5_WriteUpdate(int number, entitystate_t *s, int changedbits, siz
 		{
 			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)
@@ -1063,7 +1467,7 @@ void EntityState5_WriteUpdate(int number, entitystate_t *s, int changedbits, siz
 				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)
@@ -1074,25 +1478,25 @@ void EntityState5_WriteUpdate(int number, entitystate_t *s, int changedbits, siz
 				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);
@@ -1101,30 +1505,201 @@ void EntityState5_WriteUpdate(int number, entitystate_t *s, int changedbits, siz
 	}
 }
 
-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->alpha = 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 (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);
+		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;
+	}
+	else
+		if (o->active)
+			bits |= E5_FULLUPDATE;
+	return bits;
+}
 
 void EntityFrame5_CL_ReadFrame(void)
 {
@@ -1132,10 +1707,10 @@ void EntityFrame5_CL_ReadFrame(void)
 	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();
+	cl.latestframenum = 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
 		enumber = n & 0x7FFF;
@@ -1152,8 +1727,7 @@ void EntityFrame5_CL_ReadFrame(void)
 		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;
@@ -1175,43 +1749,14 @@ void EntityFrame5_CL_ReadFrame(void)
 	}
 }
 
-#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_AckFrame(entityframe5_database_t *d, int framenum, int viewentnum)
 {
-	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)
+	if (framenum <= d->ackframenum)
 		return;
-	d->ackedframenum = framenum;
+	d->ackframenum = framenum;
 	// scan for packets made obsolete by this ack
 	for (i = 0, p = d->packetlog;i < ENTITYFRAME5_MAXPACKETLOGS;i++, p++)
 	{
@@ -1225,37 +1770,36 @@ void EntityFrame5_AckFrame(entityframe5_t *d, int framenum)
 		// already obsolete due to a later update.
 		if (p->packetnumber < framenum)
 		{
-			// packet was lost - merge dirtybits into the main array so they
+			// 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++)
 						{
-							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;
+					d->priorities[s->number] = EntityState5_Priority(d, d->states + viewentnum, d->states + s->number, d->deltabits[s->number], d->latestframenum - d->updateframenum[s->number]);
+				}
 			}
 		}
 		// delete this packet log as it is now obsolete
@@ -1263,8 +1807,129 @@ void EntityFrame5_AckFrame(entityframe5_t *d, int framenum)
 	}
 }
 
-void EntityFrame5_WriteFrame(sizebuf_t *msg, int numstates, entity_state_t *states)
+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)
 {
+	const entity_state_t *n;
+	int i, num, l, framenum, packetlognumber, priority;
+	sizebuf_t buf;
+	qbyte data[128];
+	entityframe5_packetlog_t *packetlog;
+
+	framenum = d->latestframenum + 1;
+
+	// prepare the buffer
+	memset(&buf, 0, sizeof(buf));
+	buf.data = data;
+	buf.maxsize = sizeof(data);
+
+	// 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, d->states + viewentnum, d->states + num, d->deltabits[num], framenum - d->updateframenum[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, d->states + viewentnum, d->states + num, d->deltabits[num], framenum - d->updateframenum[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 < MAX_EDICTS;num++)
+	{
+		if (CHECKPVSBIT(d->visiblebits, num))
+		{
+			CLEARPVSBIT(d->visiblebits, num);
+			d->deltabits[num] = E5_FULLUPDATE;
+			d->priorities[num] = EntityState5_Priority(d, d->states + viewentnum, d->states + num, d->deltabits[num], framenum - d->updateframenum[num]);
+			d->states[num] = defaultstate;
+			d->states[num].number = num;
+		}
+	}
+
+	// build lists of entities by priority level
+	memset(entityframe5_prioritychaincounts, 0, sizeof(entityframe5_prioritychaincounts));
+	l = 0;
+	for (num = 0;num < MAX_EDICTS;num++)
+	{
+		if (d->priorities[num])
+		{
+			l = num;
+			priority = d->priorities[num];
+			if (entityframe5_prioritychaincounts[priority] < ENTITYFRAME5_MAXSTATES)
+				entityframe5_prioritychains[priority][entityframe5_prioritychaincounts[priority]++] = num;
+		}
+	}
+
+	// return early if there are no entities to send this time
+	if (l == 0)
+		return;
+
+	d->latestframenum = framenum;
+	MSG_WriteByte(msg, svc_entities);
+	MSG_WriteLong(msg, framenum);
+
+	// if packet log is full, an empty update is still written
+	// (otherwise the client might have nothing to ack to remove packetlogs)
+	for (packetlognumber = 0, packetlog = d->packetlog;packetlognumber < ENTITYFRAME5_MAXPACKETLOGS;packetlognumber++, packetlog++)
+		if (packetlog->packetnumber == 0)
+			break;
+	if (packetlognumber < ENTITYFRAME5_MAXPACKETLOGS)
+	{
+		// write to packet and log
+		packetlog->packetnumber = framenum;
+		packetlog->numstates = 0;
+		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);
 }
-*/