X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=protocol.c;h=0e50aaebd8fa914834752ce27afa838fc0aa46c1;hb=4596c46213ae652af1b2e4bc6b691076cff2c416;hp=0c2d844ead120c179ab1025026d8a5c7c70254ef;hpb=adbe84921a19ee5d3e3bb84ad2c0e0c7c597c789;p=xonotic%2Fdarkplaces.git

diff --git a/protocol.c b/protocol.c
index 0c2d844e..0e50aaeb 100644
--- a/protocol.c
+++ b/protocol.c
@@ -44,7 +44,6 @@ 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));
 	f->time = 0;
 	f->framenum = 0;
 	f->numentities = 0;
@@ -145,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);
@@ -185,24 +186,44 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 			delta = &baseline;
 		}
 		bits = 0;
+		VectorCopy(ent->origin, org);
+		VectorCopy(delta->origin, deltaorg);
 		if (ent->flags & RENDER_LOWPRECISION)
 		{
-			if ((int) ent->origin[0] != (int) delta->origin[0])
-				bits |= E_ORIGIN1;
-			if ((int) ent->origin[1] != (int) delta->origin[1])
-				bits |= E_ORIGIN2;
-			if ((int) ent->origin[2] != (int) delta->origin[2])
-				bits |= E_ORIGIN3;
+			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);
 		}
-		else
+		if (delta->flags & RENDER_LOWPRECISION)
 		{
-			if (fabs(ent->origin[0] - delta->origin[0]) > 0.01f)
-				bits |= E_ORIGIN1;
-			if (fabs(ent->origin[1] - delta->origin[1]) > 0.01f)
-				bits |= E_ORIGIN2;
-			if (fabs(ent->origin[2] - delta->origin[2]) > 0.01f)
-				bits |= E_ORIGIN3;
+			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 (fabs(org[1] - deltaorg[1]) > 0.01f)
+			bits |= E_ORIGIN2;
+		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;
 		if ((qbyte) (ent->angles[1] * (256.0f / 360.0f)) != (qbyte) (delta->angles[1] * (256.0f / 360.0f)))
@@ -263,20 +284,20 @@ void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
 			if (ent->flags & RENDER_LOWPRECISION)
 			{
 				if (bits & E_ORIGIN1)
-					MSG_WriteShort(msg, ent->origin[0]);
+					MSG_WriteShort(msg, org[0]);
 				if (bits & E_ORIGIN2)
-					MSG_WriteShort(msg, ent->origin[1]);
+					MSG_WriteShort(msg, org[1]);
 				if (bits & E_ORIGIN3)
-					MSG_WriteShort(msg, ent->origin[2]);
+					MSG_WriteShort(msg, org[2]);
 			}
 			else
 			{
 				if (bits & E_ORIGIN1)
-					MSG_WriteFloat(msg, ent->origin[0]);
+					MSG_WriteFloat(msg, org[0]);
 				if (bits & E_ORIGIN2)
-					MSG_WriteFloat(msg, ent->origin[1]);
+					MSG_WriteFloat(msg, org[1]);
 				if (bits & E_ORIGIN3)
-					MSG_WriteFloat(msg, ent->origin[2]);
+					MSG_WriteFloat(msg, org[2]);
 			}
 			if (bits & E_ANGLE1)
 				MSG_WriteAngle(msg, ent->angles[0]);
@@ -319,10 +340,11 @@ 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);
@@ -481,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)
@@ -535,3 +512,4 @@ int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
 	else
 		return -1;
 }
+