Don't allow dropping weapons from the stomach. They don't have anywhere to go!

diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc
index 3e6c69df8020233ff1eb84130d48b3910e92d36a..3d2cf7a3ec3946d5be98789baf138b269943d3cb 100644 (file)
--- a/data/qcsrc/server/cl_player.qc
+++ b/data/qcsrc/server/cl_player.qc
@@ -753,7 +753,6 @@ void ClearSelectedPlayer()
        }\r
 }\r
 \r
-.float dropweapon_check;\r
 void UpdateSelectedPlayer()\r
 {\r
        entity selected;\r

diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc
index 020a55cfb098f0af8682c6c6f893e10203ae724e..cd5b1da2efa92ccecfd52c5c01f81bb9fa5d3e86 100644 (file)
--- a/data/qcsrc/server/cl_weapons.qc
+++ b/data/qcsrc/server/cl_weapons.qc
@@ -274,6 +274,8 @@ void W_ThrowWeapon(vector velo, vector delta, float doreduce)
        w = self.weapon;\r
        if (w == 0)\r
                return; // just in case\r
+       if(self.predator.classname == "player" && self.dropweapon_check)\r
+               return; // can't drop weapons from the stomach\r
        if (g_lms)\r
                return;\r
        if (!cvar("g_pickup_items"))\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index e41bb3b503c039fb4bf0836fe877b2942a679e85..93f43ac403d637a76c846353e7402efcad842e4f 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -72,6 +72,7 @@ float maxclients;
 .float weapon_delay;\r
 .float fakeprey;\r
 .float stat_eaten, stat_stomachload, stat_digesting, stat_canleave, stat_canswallow;\r
+.float dropweapon_check;\r
 \r
 // Fields\r
 \r