X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;fp=data%2Fqcsrc%2Fserver%2Fw_grabber.qc;h=98c4a38506a552b1be4955d050eeb775a8ea2b90;hp=ad5fc9844e2dc003e2fc52e803e2ab11b022b776;hb=1383ce28153c75886cd6358b29a86065131ad943;hpb=8b9368db845ec0813685b75be51fa8cc4d298759

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