From 489bf866344db02e9d8c9e9d764fbd43d82b6586 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 1 Jul 2013 02:14:37 -0400 Subject: [PATCH] Remove W_TriggerReload... pointless function --- qcsrc/server/cl_impulse.qc | 16 ++++++++-------- qcsrc/server/weapons/cl_weapons.qc | 7 +------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc index 3288bbc72..c047d20b7 100644 --- a/qcsrc/server/cl_impulse.qc +++ b/qcsrc/server/cl_impulse.qc @@ -77,37 +77,37 @@ void ImpulseCommands (void) switch(imp) { case 10: - W_NextWeapon (0); + W_NextWeapon(0); break; case 11: W_LastWeapon(); break; case 12: - W_PreviousWeapon (0); + W_PreviousWeapon(0); break; case 13: - W_SwitchWeapon (w_getbestweapon(self)); + W_SwitchWeapon(w_getbestweapon(self)); break; case 14: W_NextWeaponOnImpulse(0); break; case 15: - W_NextWeapon (2); + W_NextWeapon(2); break; case 16: - W_PreviousWeapon (2); + W_PreviousWeapon(2); break; case 17: W_ThrowWeapon(W_CalculateProjectileVelocity(self.velocity, v_forward * 750, FALSE), '0 0 0', TRUE); break; case 18: - W_NextWeapon (1); + W_NextWeapon(1); break; case 19: - W_PreviousWeapon (1); + W_PreviousWeapon(1); break; case 20: - W_TriggerReload (); + WEP_ACTION(self.weapon, WR_RELOAD); break; } } diff --git a/qcsrc/server/weapons/cl_weapons.qc b/qcsrc/server/weapons/cl_weapons.qc index ee8e9115e..bf72ae15a 100644 --- a/qcsrc/server/weapons/cl_weapons.qc +++ b/qcsrc/server/weapons/cl_weapons.qc @@ -1,8 +1,3 @@ -void W_TriggerReload() -{ - WEP_ACTION(self.weapon, WR_RELOAD); -} - // switch between weapons void W_SwitchWeapon(float imp) { @@ -15,7 +10,7 @@ void W_SwitchWeapon(float imp) } else { - W_TriggerReload(); + WEP_ACTION(self.weapon, WR_RELOAD); } } -- 2.39.2