From 24a753edceb4b69e6059e67c0907a3bd7a1587ec Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Sat, 24 Oct 2020 05:02:14 +0200 Subject: [PATCH] env_sprite: Fix that sprites marked as PLAYONCE may be networked in some semi-visible form --- src/gs-entbase/server/env_sprite.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/gs-entbase/server/env_sprite.cpp b/src/gs-entbase/server/env_sprite.cpp index 3b2f95ed..c8b8133e 100644 --- a/src/gs-entbase/server/env_sprite.cpp +++ b/src/gs-entbase/server/env_sprite.cpp @@ -45,17 +45,20 @@ class env_sprite:CBaseTrigger void(void) env_sprite; virtual void(entity, int) Trigger; - virtual float(entity, float) Network; + virtual float(entity, float) SendEntity; virtual void(string, string) SpawnKey; }; float -env_sprite::Network(entity pvsent, float flags) +env_sprite::SendEntity(entity pvsent, float flags) { - /* Delete it on the client. */ - if (m_iToggled == FALSE) { + if (spawnflags & ENVS_PLAYONCE) return FALSE; - } + + /* Delete it on the client. */ + if (m_iToggled == FALSE) + return FALSE; + WriteByte(MSG_ENTITY, ENT_SPRITE); WriteFloat(MSG_ENTITY, 666); WriteCoord(MSG_ENTITY, origin[0]); @@ -129,9 +132,4 @@ env_sprite::env_sprite(void) CBaseTrigger::CBaseTrigger(); m_iToggled = ((spawnflags & ENVS_STARTON) > 0); - - if (!(spawnflags & ENVS_PLAYONCE)) { - SendEntity = Network; - SendFlags = 1; - } }