Add a cvar that allows disabling the vore system. Yes, it's the core part Vore Tourna...

[voretournament/voretournament.git] / data / qcsrc / server / cl_weaponsystem.qc

diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc
index 76ea196e3baaa9ad721f580c98d69613ed7fc54e..8c927429d545691ff85fcaa6eed4d80615abdd3f 100644 (file)
--- a/data/qcsrc/server/cl_weaponsystem.qc
+++ b/data/qcsrc/server/cl_weaponsystem.qc
@@ -253,7 +253,7 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
 {\r
        // hide the exterior weapon entity of a predator from their prey\r
        // otherwise, the stomach model the predator is transformed in (see Client_customizeentityforclient) will have a weapon model attached to it\r
-       if(self.owner.weaponname == "")\r
+       if(self.owner.weaponname == "" || self.owner.deadflag != DEAD_NO)\r
                return TRUE;\r
        if(other.cvar_chase_active > 0 || other.classname == "observer") // the classname check prevents a bug\r
        {\r
@@ -262,7 +262,7 @@ float CL_ExteriorWeaponentity_CustomizeEntityForClient()
        }\r
        if(other.spectatee_status)\r
                other = other.enemy; // also do this for the player we are spectating\r
-       if(other.eater == self.owner)\r
+       if(other.predator == self.owner)\r
        {\r
                setmodel(self, "");\r
                return TRUE;\r
@@ -578,6 +578,7 @@ void CL_Weaponentity_Think()
                self.weaponentity.effects = self.effects;\r
                self.weaponentity.alpha = self.alpha;\r
                self.weaponentity.colormap = self.colormap;\r
+               self.weaponentity.colormod = self.owner.colormod; // used by the regurgitating colors\r
        }\r
 \r
        self.angles = '0 0 0';\r
@@ -788,6 +789,7 @@ void CL_ExteriorWeaponentity_Think()
                self.alpha = self.owner.alpha;\r
        else\r
                self.alpha = 1;\r
+       self.colormod = self.owner.colormod; // used by the regurgitating colors\r
 \r
        ang_x = bound(sv_pitch_min, self.owner.v_angle_x, sv_pitch_max);\r
        ang_y = 0;\r
@@ -889,7 +891,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                                if (complain)\r
                                if(clienttype(cl) == CLIENTTYPE_REAL)\r
                                {\r
-                                       play2(cl, "weapons/unavailable.wav");\r
+                                       play2(cl, "misc/unavailable.wav");\r
                                        sprint(cl, strcat("You don't have any ammo for the ^2", W_Name(wpn), "\n"));\r
                                }\r
                                return FALSE;\r
@@ -933,7 +935,7 @@ float client_hasweapon(entity cl, float wpn, float andammo, float complain)
                else\r
                        sprint(cl, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") );\r
 \r
-               play2(cl, "weapons/unavailable.wav");\r
+               play2(cl, "misc/unavailable.wav");\r
        }\r
        return FALSE;\r
 };\r
@@ -969,7 +971,6 @@ void weapon_setup(float windex)
        // the two weapon entities will notice this has changed and update their models\r
        self.weapon = windex;\r
        self.weaponname = e.mdl;\r
-       self.bulletcounter = 0;\r
 };\r
 \r
 // perform weapon to attack (weaponstate and attack_finished check is here)\r
@@ -1026,7 +1027,6 @@ float weapon_prepareattack(float secondary, float attacktime)
                }\r
                ATTACK_FINISHED(self) = ATTACK_FINISHED(self) + attacktime * W_WeaponRateFactor();\r
        }\r
-       self.bulletcounter += 1;\r
        //dprint("attack finished ", ftos(ATTACK_FINISHED(self)), "\n");\r
        return TRUE;\r
 };\r