Merge branch 'master' into mirceakitsune/weapon_display

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

diff --git a/data/qcsrc/server/w_grabber.qc b/data/qcsrc/server/w_grabber.qc
index ad5fc9844e2dc003e2fc52e803e2ab11b022b776..98c4a38506a552b1be4955d050eeb775a8ea2b90 100644 (file)
--- a/data/qcsrc/server/w_grabber.qc
+++ b/data/qcsrc/server/w_grabber.qc
@@ -36,7 +36,7 @@ void W_Grabber_Attack2()
        if(time < self.weapon_delay)\r
                return;\r
 \r
-       W_SetupShot (self, TRUE, 0, "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage"));\r
+       W_SetupShot (self, TRUE, cvar("g_balance_grabber_secondary_recoil"), "weapons/grabber_altfire.wav", cvar("g_balance_grabber_secondary_damage"));\r
        pointparticles(particleeffectnum("grabber_muzzleflash"), w_shotorg, '0 0 0', 1);\r
        W_Grabber_UpdateStats(self, TRUE, FALSE); // the hit is recorded below\r
 \r
@@ -60,9 +60,6 @@ void W_Grabber_Attack2()
                W_Grabber_UpdateStats(self, FALSE, TRUE); // the shot is recorded above\r
        }\r
 \r
-       if (!g_norecoil)\r
-               self.punchangle_x -= cvar("g_balance_grabber_secondary_recoil");\r
-\r
        W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_secondary_ammo"), cvar("g_balance_grabber_reload_ammo"));\r
 }\r
 \r
@@ -114,8 +111,7 @@ float w_grabber(float req)
                                if (time > self.grabber_refire)\r
                                if (weapon_prepareattack(0, -1))\r
                                {\r
-                                       if (!g_norecoil)\r
-                                               self.punchangle_x -= cvar("g_balance_grabber_primary_recoil");\r
+                                       W_SetupShot (self, TRUE, cvar("g_balance_grabber_primary_recoil"), "", 0); // do this for recoil\r
                                        W_DecreaseAmmo(ammo_fuel, cvar("g_balance_grabber_primary_ammo"), cvar("g_balance_grabber_reload_ammo"));\r
                                        self.grabber_state |= GRABBER_FIRING;\r
                                        weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_grabber_primary_animtime"), w_ready);                               \r