Re-fix players showing as stomach models after being spectated, then the spectator...

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 3062930029604e786ba4ae094ad7f8a211c3b141..13133ad5e3f9b46c4a909ad4d4a9f22118856080 100644 (file)
--- 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)\r
        stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
 \r
-       if(other.spectatee_status)\r
+       if(other.spectatee_status == num_for_edict(other.enemy))\r
                other = other.enemy; // also do this for the player we are spectating\r
 \r
        // don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view\r

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index cf64d15103432df58c14701776e08b9f98968ee8..30f74cf5e907ec06eb3ed9abdb1224135ebf4fb3 100644 (file)
--- 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)\r
                return TRUE;\r
 \r
-       if(other.spectatee_status)\r
+       if(other.spectatee_status == num_for_edict(other.enemy))\r
                other = other.enemy; // also do this for the player we are spectating\r
 \r
        if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug\r