From d39fcb8a15238cd7e6cee8364007845ecc5f6264 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 19 Apr 2011 21:56:35 +0300 Subject: [PATCH] Remove my previous prevention of running the models each frame, as that's already prevented somewhere else --- data/qcsrc/server/cl_client.qc | 16 +++++----------- data/qcsrc/server/cl_weaponsystem.qc | 10 ++-------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 2bbc265b..a9668ea4 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -522,20 +522,14 @@ float Client_customizeentityforclient() if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug if(other.predator == self || other.fakepredator == self) { - if(self.model != stomachmodel) // don't execute each frame - { - Client_setmodel(stomachmodel); - self.alpha = other.cvar_cl_vore_stomachmodel; - } + Client_setmodel(stomachmodel); + self.alpha = other.cvar_cl_vore_stomachmodel; return TRUE; } - if(self.model != setmodel_state()) // don't execute each frame - { - Client_setmodel(setmodel_state()); - if not(self.predator.classname == "player" || self.fakeprey) - self.alpha = default_player_alpha; - } + Client_setmodel(setmodel_state()); + if not(self.predator.classname == "player" || self.fakeprey) + self.alpha = default_player_alpha; return TRUE; } diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 0ac64046..d4253c4d 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -262,17 +262,11 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient() if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug if(other.predator == self.owner || other.fakepredator == self.owner) { - if(self.model != "") // don't execute each frame - { - setmodel(self, ""); - } + setmodel(self, ""); return TRUE; } - if(self.model != strcat("models/weapons/v_", self.owner.weaponname, ".md3")) // don't execute each frame - { - setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); - } + setmodel(self, strcat("models/weapons/v_", self.owner.weaponname, ".md3")); return TRUE; } -- 2.39.2