From 7a8db04cd3606884419471a89f6ac412e19335be Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 8 Jul 2011 02:58:29 +0300 Subject: [PATCH] Re-fix players showing as stomach models after being spectated, then the spectator becoming an observer. --- data/qcsrc/server/cl_client.qc | 2 +- data/qcsrc/server/cl_weaponsystem.qc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 30629300..13133ad5 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -523,7 +523,7 @@ float Client_customizeentityforclient() // this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww) stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length - if(other.spectatee_status) + if(other.spectatee_status == num_for_edict(other.enemy)) other = other.enemy; // also do this for the player we are spectating // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index cf64d151..30f74cf5 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -256,7 +256,7 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient() if(self.owner.weaponname == "" || self.owner.deadflag != DEAD_NO) return TRUE; - if(other.spectatee_status) + if(other.spectatee_status == num_for_edict(other.enemy)) other = other.enemy; // also do this for the player we are spectating if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug -- 2.39.2