Remove firing the grabber with the jetpack button when we have no jetpack. That's...

diff --git a/data/qcsrc/server/g_grabber.qc b/data/qcsrc/server/g_grabber.qc
index 1c3361e1f929e5403ed5a8d88dac9d333a7dc526..4ea53d329f61a9b3ea5fa57af3defbfaa947b9e3 100644 (file)
--- a/data/qcsrc/server/g_grabber.qc
+++ b/data/qcsrc/server/g_grabber.qc
@@ -85,7 +85,6 @@ float LostMovetypeFollow(entity ent)
 }\r
 \r
 .float grabber_length;\r
-.float grabber_switchweapon;\r
 \r
 void RemoveGrabber(entity pl)\r
 {\r
@@ -338,43 +337,12 @@ void FireGrabber (void)
        missile.damageforcescale = 0;\r
 }\r
 \r
-//  voidGrabberFrame()\r
-//  {\r
-//         // this function has been modified for Voretournament\r
-// -       if (self.BUTTON_JETPACK && g_grabber)\r
-//         {\r
-// -               if (!self.grabber && self.grabber_time <= time && !self.button6_pressed_before)\r
-// -                       if (timeoutStatus != 2) //only allow the player to fire the grabber if the game is not paused (timeout)\r
-// -                               FireGrabber();\r
-//         }\r
-// -       else\r
-//         {\r
-//                 if (self.grabber)\r
-//                         RemoveGrabber(self);\r
-//         }\r
-// -       self.button6_pressed_before = self.BUTTON_JETPACK;\r
-//         /*\r
-//         // if I have no grabber or it's not pulling yet, make sure I'm not flying!\r
-//         if((self.grabber == world || !self.grabber.state) && self.movetype == MOVETYPE_FLY)\r
-\r
 void GrabberFrame()\r
 {\r
        if(timeoutStatus != 2 && self.weapon != WEP_GRABBER)\r
        {\r
-               // offhand grabber controls\r
-               if(self.BUTTON_JETPACK)\r
-               {\r
-                       if not(self.grabber || (self.grabber_state & GRABBER_WAITING_FOR_RELEASE))\r
-                       {\r
-                               self.grabber_state |= GRABBER_FIRING;\r
-                               self.grabber_state |= GRABBER_WAITING_FOR_RELEASE;\r
-                       }\r
-               }\r
-               else\r
-               {\r
-                       self.grabber_state |= GRABBER_REMOVING;\r
-                       self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;\r
-               }\r
+               self.grabber_state |= GRABBER_REMOVING;\r
+               self.grabber_state &~= GRABBER_WAITING_FOR_RELEASE;\r
 \r
                self.grabber_state &~= GRABBER_RELEASING;\r
                if(self.BUTTON_CROUCH)\r
@@ -388,12 +356,6 @@ void GrabberFrame()
                        //self.grabber_state &~= GRABBER_RELEASING;\r
                }\r
        }\r
-       else if(!(self.items & IT_JETPACK) && self.switchweapon != WEP_GRABBER)\r
-       {\r
-               if(self.BUTTON_JETPACK && !self.grabber_switchweapon)\r
-                       W_SwitchWeapon(WEP_GRABBER);\r
-       }\r
-       self.grabber_switchweapon = self.BUTTON_JETPACK;\r
 \r
        if(self.weapon != WEP_GRABBER)\r
        {\r

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index 92a12238607722cac2be233d045475480c245eb7..34b13778478d2e716e2e3e0a2918546e9c7d6ed8 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -87,7 +87,7 @@ float w_grabber(float req)
                }\r
                else if not(self.clip_load < 0) // we're currently reloading\r
                {\r
-                       if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
+                       if (self.BUTTON_ATCK)\r
                        {\r
                                if(time < self.weapon_delay)\r
                                        return FALSE;\r
@@ -164,7 +164,7 @@ float w_grabber(float req)
                if (self.BUTTON_CROUCH)\r
                {\r
                        self.grabber_state &~= GRABBER_PULLING;\r
-                       if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
+                       if (self.BUTTON_ATCK)\r
                                self.grabber_state &~= GRABBER_RELEASING;\r
                        else\r
                                self.grabber_state |= GRABBER_RELEASING;\r
@@ -174,7 +174,7 @@ float w_grabber(float req)
                        self.grabber_state |= GRABBER_PULLING;\r
                        self.grabber_state &~= GRABBER_RELEASING;\r
 \r
-                       if (self.BUTTON_ATCK || (!(self.items & IT_JETPACK) && self.BUTTON_JETPACK))\r
+                       if (self.BUTTON_ATCK)\r
                        {\r
                                // already fired\r
                                if(self.grabber)\r