From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 14 Jun 2011 18:55:08 +0000 (+0000)
Subject: fix entity networking AGAIN
X-Git-Tag: xonotic-v0.6.0~163^2~346
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2000fe0dea529231a494c63436f171829cbf43e5;p=xonotic%2Fdarkplaces.git

fix entity networking AGAIN

Do NOT inhibit sending EntityState5 removes for CSQC entities!
These entities may be needed for state changes.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11200 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/protocol.c b/protocol.c
index 7e604634..c263d2d3 100644
--- a/protocol.c
+++ b/protocol.c
@@ -2063,13 +2063,13 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi
 	//dp_model_t *model;
 	ENTITYSIZEPROFILING_START(msg, s->number);
 
-	if (PRVM_serveredictfunction((&prog->edicts[s->number]), SendEntity))
-		return;
-
 	if (s->active != ACTIVE_NETWORK)
 		MSG_WriteShort(msg, number | 0x8000);
 	else
 	{
+		if (PRVM_serveredictfunction((&prog->edicts[s->number]), SendEntity))
+			return;
+
 		bits = changedbits;
 		if ((bits & E5_ORIGIN) && (!(s->flags & RENDER_LOWPRECISION) || s->exteriormodelforclient || s->tagentity || s->viewmodelforclient || (s->number >= 1 && s->number <= svs.maxclients) || s->origin[0] <= -4096.0625 || s->origin[0] >= 4095.9375 || s->origin[1] <= -4096.0625 || s->origin[1] >= 4095.9375 || s->origin[2] <= -4096.0625 || s->origin[2] >= 4095.9375))
 		// maybe also add: ((model = SV_GetModelByIndex(s->modelindex)) != NULL && model->name[0] == '*')