From a55b6f22d01ac2e2c45874e31b6bd029482841b5 Mon Sep 17 00:00:00 2001 From: tzork Date: Wed, 19 Aug 2009 17:53:06 +0000 Subject: [PATCH] Fix constant flyby sound for nex when spectating nex/minsta user. second try. git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7472 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_client.qc | 6 ------ data/qcsrc/server/defs.qh | 7 +++++++ data/qcsrc/server/w_common.qc | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index d121dab8b..be4b32c15 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1,9 +1,3 @@ -.float spectatee_status; -.float zoomstate; -.float bloodloss_timer; -.float restriction; - -.entity clientdata; float ClientData_Send(entity to, float sf) { if(to != self.owner) diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index 508dc11fc..dc1ebc014 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -613,3 +613,10 @@ float client_cefc_accumulatortime; #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE // when doing this, hagar can go through clones // #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_BBOX + +.float spectatee_status; +.float zoomstate; +.float bloodloss_timer; +.float restriction; + +.entity clientdata; diff --git a/data/qcsrc/server/w_common.qc b/data/qcsrc/server/w_common.qc index e42c6dc03..8bc4ac194 100644 --- a/data/qcsrc/server/w_common.qc +++ b/data/qcsrc/server/w_common.qc @@ -88,7 +88,7 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, f { if(clienttype(ent) == CLIENTTYPE_REAL) - if(ent.health != -666) + if not (ent.spectatee_status) if(ent != self) ent.ticrate = 1; -- 2.39.2