X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=0e50aaebd8fa914834752ce27afa838fc0aa46c1;hb=fe0d81655d6c8f5b722fea3282a99a734134b73b;hp=a5e16ab285fd34c9b57e4f9f889a03716ce6d948;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849;p=xonotic%2Fdarkplaces.git

diff --git a/protocol.c b/protocol.c
index a5e16ab2..0e50aaeb 100644
--- a/protocol.c
+++ b/protocol.c
@@ -44,8 +44,17 @@ void EntityFrame_AckFrame(entity_database_t *d, int frame)
 // (server) clears frame, to prepare for adding entities
 void EntityFrame_Clear(entity_frame_t *f, vec3_t eye)
 {
-	memset(f, 0, sizeof(*f));
-	VectorCopy(eye, f->eye);
+	f->time = 0;
+	f->framenum = 0;
+	f->numentities = 0;
+	if (eye == NULL)
+	{
+		VectorClear(f->eye);
+	}
+	else
+	{
+		VectorCopy(eye, f->eye);
+	}
 }
 
 // (server) allocates an entity slot in frame, returns NULL if full
@@ -64,7 +73,7 @@ entity_state_t *EntityFrame_NewEntity(entity_frame_t *f, int number)
 void EntityFrame_FetchFrame(entity_database_t *d, int framenum, entity_frame_t *f)
 {
 	int i, n;
-	memset(f, 0, sizeof(*f));
+	EntityFrame_Clear(f, NULL);
 	for (i = 0;i < d->numframes && d->frames[i].framenum < framenum;i++);
 	if (i < d->numframes && framenum == d->frames[i].framenum)
 	{
@@ -135,10 +144,12 @@ void EntityFrame_AddFrame(entity_database_t *d, entity_frame_t *f)
 }
 
 // (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)
 {
 	int i, onum, bits, number;
-	entity_frame_t deltaframe, *o = &deltaframe;
+	float org[3], deltaorg[3];
+	entity_frame_t *o = &deltaframe;
 	entity_state_t *ent, *delta, baseline;
 
 	EntityFrame_AddFrame(d, f);
@@ -175,11 +186,43 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 			delta = &baseline;
 		}
 		bits = 0;
-		if ((int) ent->origin[0] != (int) delta->origin[0])
+		VectorCopy(ent->origin, org);
+		VectorCopy(delta->origin, deltaorg);
+		if (ent->flags & RENDER_LOWPRECISION)
+		{
+			if (org[0] > 0)
+				org[0] = (int) (org[0] + 0.5f);
+			else
+				org[0] = (int) (org[0] - 0.5f);
+			if (org[1] > 0)
+				org[1] = (int) (org[1] + 0.5f);
+			else
+				org[1] = (int) (org[1] - 0.5f);
+			if (org[2] > 0)
+				org[2] = (int) (org[2] + 0.5f);
+			else
+				org[2] = (int) (org[2] - 0.5f);
+		}
+		if (delta->flags & RENDER_LOWPRECISION)
+		{
+			if (deltaorg[0] > 0)
+				deltaorg[0] = (int) (deltaorg[0] + 0.5f);
+			else
+				deltaorg[0] = (int) (deltaorg[0] - 0.5f);
+			if (deltaorg[1] > 0)
+				deltaorg[1] = (int) (deltaorg[1] + 0.5f);
+			else
+				deltaorg[1] = (int) (deltaorg[1] - 0.5f);
+			if (deltaorg[2] > 0)
+				deltaorg[2] = (int) (deltaorg[2] + 0.5f);
+			else
+				deltaorg[2] = (int) (deltaorg[2] - 0.5f);
+		}
+		if (fabs(org[0] - deltaorg[0]) > 0.01f)
 			bits |= E_ORIGIN1;
-		if ((int) ent->origin[1] != (int) delta->origin[1])
+		if (fabs(org[1] - deltaorg[1]) > 0.01f)
 			bits |= E_ORIGIN2;
-		if ((int) ent->origin[2] != (int) delta->origin[2])
+		if (fabs(org[2] - deltaorg[2]) > 0.01f)
 			bits |= E_ORIGIN3;
 		if ((qbyte) (ent->angles[0] * (256.0f / 360.0f)) != (qbyte) (delta->angles[0] * (256.0f / 360.0f)))
 			bits |= E_ANGLE1;
@@ -235,12 +278,27 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 						MSG_WriteByte(msg, (bits >> 24) & 0xFF);
 				}
 			}
-			if (bits & E_ORIGIN1)
-				MSG_WriteShort(msg, ent->origin[0]);
-			if (bits & E_ORIGIN2)
-				MSG_WriteShort(msg, ent->origin[1]);
-			if (bits & E_ORIGIN3)
-				MSG_WriteShort(msg, ent->origin[2]);
+			// 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_WriteShort(msg, org[0]);
+				if (bits & E_ORIGIN2)
+					MSG_WriteShort(msg, org[1]);
+				if (bits & E_ORIGIN3)
+					MSG_WriteShort(msg, org[2]);
+			}
+			else
+			{
+				if (bits & E_ORIGIN1)
+					MSG_WriteFloat(msg, org[0]);
+				if (bits & E_ORIGIN2)
+					MSG_WriteFloat(msg, org[1]);
+				if (bits & E_ORIGIN3)
+					MSG_WriteFloat(msg, org[2]);
+			}
 			if (bits & E_ANGLE1)
 				MSG_WriteAngle(msg, ent->angles[0]);
 			if (bits & E_ANGLE2)
@@ -248,17 +306,17 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 			if (bits & E_ANGLE3)
 				MSG_WriteAngle(msg, ent->angles[2]);
 			if (bits & E_MODEL1)
-				MSG_WriteByte(msg, ent->modelindex & 0x00FF);
+				MSG_WriteByte(msg, ent->modelindex & 0xFF);
 			if (bits & E_MODEL2)
-				MSG_WriteByte(msg, ent->modelindex & 0xFF00);
+				MSG_WriteByte(msg, (ent->modelindex >> 8) & 0xFF);
 			if (bits & E_FRAME1)
-				MSG_WriteByte(msg, ent->frame & 0x00FF);
+				MSG_WriteByte(msg, ent->frame & 0xFF);
 			if (bits & E_FRAME2)
-				MSG_WriteByte(msg, ent->frame & 0xFF00);
+				MSG_WriteByte(msg, (ent->frame >> 8) & 0xFF);
 			if (bits & E_EFFECTS1)
-				MSG_WriteByte(msg, ent->effects & 0x00FF);
+				MSG_WriteByte(msg, ent->effects & 0xFF);
 			if (bits & E_EFFECTS2)
-				MSG_WriteByte(msg, ent->effects & 0xFF00);
+				MSG_WriteByte(msg, (ent->effects >> 8) & 0xFF);
 			if (bits & E_COLORMAP)
 				MSG_WriteByte(msg, ent->colormap);
 			if (bits & E_SKIN)
@@ -271,8 +329,6 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 				MSG_WriteByte(msg, ent->glowsize);
 			if (bits & E_GLOWCOLOR)
 				MSG_WriteByte(msg, ent->glowcolor);
-			if (bits & E_FLAGS)
-				MSG_WriteByte(msg, ent->flags);
 		}
 	}
 	for (;onum < o->numentities;onum++)
@@ -284,14 +340,17 @@ 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)
 {
 	int number, removed, bits;
-	entity_frame_t framedata, *f = &framedata, deltaframedata, *delta = &deltaframedata;
+	entity_frame_t *f = &framedata, *delta = &deltaframe;
 	entity_state_t *e, baseline, *old, *oldend;
 
 	ClearStateToDefault(&baseline);
-	memset(f, 0, sizeof(*f));
+
+	EntityFrame_Clear(f, NULL);
+
 	// read the frame header info
 	f->time = cl.mtime[0];
 	number = MSG_ReadLong();
@@ -365,12 +424,38 @@ void EntityFrame_Read(entity_database_t *d)
 				}
 			}
 
-			if (bits & E_ORIGIN1)
-				e->origin[0] = (signed short) MSG_ReadShort();
-			if (bits & E_ORIGIN2)
-				e->origin[1] = (signed short) MSG_ReadShort();
-			if (bits & E_ORIGIN3)
-				e->origin[2] = (signed short) MSG_ReadShort();
+			if (dpprotocol == DPPROTOCOL_VERSION2)
+			{
+				if (bits & E_ORIGIN1)
+					e->origin[0] = (signed short) MSG_ReadShort();
+				if (bits & E_ORIGIN2)
+					e->origin[1] = (signed short) MSG_ReadShort();
+				if (bits & E_ORIGIN3)
+					e->origin[2] = (signed short) MSG_ReadShort();
+			}
+			else
+			{
+				if (bits & E_FLAGS)
+					e->flags = MSG_ReadByte();
+				if (e->flags & RENDER_LOWPRECISION || dpprotocol == DPPROTOCOL_VERSION2)
+				{
+					if (bits & E_ORIGIN1)
+						e->origin[0] = (signed short) MSG_ReadShort();
+					if (bits & E_ORIGIN2)
+						e->origin[1] = (signed short) MSG_ReadShort();
+					if (bits & E_ORIGIN3)
+						e->origin[2] = (signed short) MSG_ReadShort();
+				}
+				else
+				{
+					if (bits & E_ORIGIN1)
+						e->origin[0] = MSG_ReadFloat();
+					if (bits & E_ORIGIN2)
+						e->origin[1] = MSG_ReadFloat();
+					if (bits & E_ORIGIN3)
+						e->origin[2] = MSG_ReadFloat();
+				}
+			}
 			if (bits & E_ANGLE1)
 				e->angles[0] = MSG_ReadAngle();
 			if (bits & E_ANGLE2)
@@ -378,17 +463,17 @@ void EntityFrame_Read(entity_database_t *d)
 			if (bits & E_ANGLE3)
 				e->angles[2] = MSG_ReadAngle();
 			if (bits & E_MODEL1)
-				e->modelindex = (e->modelindex & 0xFF00) | MSG_ReadByte();
+				e->modelindex = (e->modelindex & 0xFF00) | (unsigned int) MSG_ReadByte();
 			if (bits & E_MODEL2)
-				e->modelindex = (e->modelindex & 0x00FF) | (MSG_ReadByte() << 8);
+				e->modelindex = (e->modelindex & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
 			if (bits & E_FRAME1)
-				e->frame = (e->frame & 0xFF00) | MSG_ReadByte();
+				e->frame = (e->frame & 0xFF00) | (unsigned int) MSG_ReadByte();
 			if (bits & E_FRAME2)
-				e->frame = (e->frame & 0x00FF) | (MSG_ReadByte() << 8);
+				e->frame = (e->frame & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
 			if (bits & E_EFFECTS1)
-				e->effects = (e->effects & 0xFF00) | MSG_ReadByte();
+				e->effects = (e->effects & 0xFF00) | (unsigned int) MSG_ReadByte();
 			if (bits & E_EFFECTS2)
-				e->effects = (e->effects & 0x00FF) | (MSG_ReadByte() << 8);
+				e->effects = (e->effects & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
 			if (bits & E_COLORMAP)
 				e->colormap = MSG_ReadByte();
 			if (bits & E_SKIN)
@@ -401,8 +486,9 @@ void EntityFrame_Read(entity_database_t *d)
 				e->glowsize = MSG_ReadByte();
 			if (bits & E_GLOWCOLOR)
 				e->glowcolor = MSG_ReadByte();
-			if (bits & E_FLAGS)
-				e->flags = MSG_ReadByte();
+			if (dpprotocol == DPPROTOCOL_VERSION2)
+				if (bits & E_FLAGS)
+					e->flags = MSG_ReadByte();
 		}
 	}
 	while (old < oldend)
@@ -417,51 +503,6 @@ void EntityFrame_Read(entity_database_t *d)
 	EntityFrame_AddFrame(d, f);
 }
 
-/*
-// (client) reads (and interpolates) the eye location from the database,
-// given a current time
-int EntityFrame_FetchEye(entity_database_t *d, vec3_t eye, double time)
-{
-	float frac;
-	if (d->numframes == 0)
-		return false;
-//		Host_Error("EntityFrame_FetchEye: no frames\n");
-	if (d->numframes > 1 && d->frames[d->numframes - 2].time != d->frames[d->numframes - 1].time)
-	{
-		frac = (time - d->frames[d->numframes - 2].time) / (d->frames[d->numframes - 1].time - d->frames[d->numframes - 2].time);
-		frac = bound(0, frac, 1);
-		VectorSubtract(d->frames[d->numframes - 2].eye, d->frames[d->numframes - 1].eye, eye);
-		VectorMA(d->frames[d->numframes - 2].eye, frac, eye, eye);
-	}
-	else
-		VectorCopy(d->frames[0].eye, eye);
-	return true;
-}
-
-// (client) fetchs an entity from a frame, index is the index into the frame's entity list, returns false if index is out of bounds
-int EntityFrame_FetchEntityByIndex(entity_frame_t *f, entity_state_t *e, int index)
-{
-	if (index < 0 || index >= f->numentities)
-		return false;
-	memcpy(e, f->entitydata + index, sizeof(*e));
-	return true;
-}
-
-int EntityFrame_FetchEntityByNumber(entity_frame_t *f, entity_state_t *e, int number)
-{
-	int i;
-	for (i = 0;i < f->numentities;i++)
-	{
-		if (f->entitydata[i].number == number)
-		{
-			memcpy(e, f->entitydata + i, sizeof(*e));
-			return true;
-		}
-	}
-	ClearStateToDefault(e);
-	return false;
-}
-*/
 
 // (client) returns the frame number of the most recent frame recieved
 int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
@@ -471,3 +512,4 @@ int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
 	else
 		return -1;
 }
+