From 4429e1a365503fe2d1108136376701fdb3aa2b60 Mon Sep 17 00:00:00 2001 From: divverent Date: Tue, 14 Jun 2011 18:55:08 +0000 Subject: [PATCH] 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 ::stable-branch::merge=2000fe0dea529231a494c63436f171829cbf43e5 --- protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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] == '*') -- 2.39.2