From 1dd3fe0eff0a9cd58b4b9796fe525e2fdac2358c Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Fri, 8 Apr 2022 14:20:49 -0700 Subject: [PATCH] Client: Add cvar: v_muzzledlight --- src/client/view.qc | 9 ++++++--- src/gs-entbase/server/NSPhysicsEntity.h | 1 + src/gs-entbase/server/NSPhysicsEntity.qc | 16 ++++++++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/client/view.qc b/src/client/view.qc index 18fb8c90..25c465a2 100644 --- a/src/client/view.qc +++ b/src/client/view.qc @@ -14,7 +14,8 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -var int autocvar_v_modellag = 0; +var bool autocvar_v_modellag = 0; +var bool autocvar_v_muzzledlight = 1; void View_Init(void) @@ -236,7 +237,8 @@ View_DrawViewModel(void) m_eMuzzleflash.angles = m_eViewModel.angles; m_eMuzzleflash.angles[2] += (random() * 10) - 5; - //dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]); + if (autocvar_v_muzzledlight == true) + dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]); setorigin(m_eMuzzleflash, m_eMuzzleflash.origin); addentity(m_eMuzzleflash); @@ -247,7 +249,8 @@ View_DrawViewModel(void) m_eMuzzleflashL.angles = m_eViewModelL.angles; m_eMuzzleflashL.angles[2] += (random() * 10) - 5; - //dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]); + if (autocvar_v_muzzledlight == true) + dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]); setorigin(m_eMuzzleflashL, m_eMuzzleflashL.origin); addentity(m_eMuzzleflashL); diff --git a/src/gs-entbase/server/NSPhysicsEntity.h b/src/gs-entbase/server/NSPhysicsEntity.h index 0504a671..7034c029 100644 --- a/src/gs-entbase/server/NSPhysicsEntity.h +++ b/src/gs-entbase/server/NSPhysicsEntity.h @@ -44,6 +44,7 @@ class NSPhysicsEntity:NSSurfacePropEntity virtual void(void) touch; virtual void(void) TouchThink; virtual void(void) Pain; + virtual void(void) Death; virtual void(string, string) SpawnKey; virtual void(float) SetMass; diff --git a/src/gs-entbase/server/NSPhysicsEntity.qc b/src/gs-entbase/server/NSPhysicsEntity.qc index 2aef28d5..20a6cae1 100644 --- a/src/gs-entbase/server/NSPhysicsEntity.qc +++ b/src/gs-entbase/server/NSPhysicsEntity.qc @@ -255,9 +255,21 @@ NSPhysicsEntity::Pain(void) if (force > 0.0f) ApplyForceOffset(v_forward * force, origin - trace_endpos); - if (!HasPropData()) { - health = 100000; + /* if we don't have prop data, don't consider death */ + if (HasPropData() == false) + health = 10000; +} + +void +NSPhysicsEntity::Death(void) +{ + Pain(); + super::Death(); + + if (takedamage != DAMAGE_YES) { + takedamage = (DAMAGE_YES); } + health = 1000; } void