Allow fall damage in situations where it should be allowed

[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 3430c1a961ad6d0f4f656728756f064cfafcc01e..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
@@ -891,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
@@ -935,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