From 22d2ecbc907489e710cc372898a89398e27f216e Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Mon, 3 Jul 2006 21:54:53 +0000 Subject: [PATCH] don't spam errors on laser alt fire, if previous weapon is invalid git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1712 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/w_laser.qc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/w_laser.qc b/data/qcsrc/server/w_laser.qc index b703f3b61..17cf6e3c8 100644 --- a/data/qcsrc/server/w_laser.qc +++ b/data/qcsrc/server/w_laser.qc @@ -1,3 +1,4 @@ +void(float imp) W_SwitchWeapon; void W_Laser_Touch (void) { @@ -71,8 +72,8 @@ float(float req) w_laser = weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_animtime"), w_ready); } if (self.button3) - if (client_hasweapon(self, self.cnt, TRUE, TRUE)) - self.switchweapon = self.cnt; + if (client_hasweapon(self, self.cnt, TRUE, FALSE)) + W_SwitchWeapon (self.cnt); } else if (req == WR_SETUP) weapon_setup(WEP_LASER, "laser", 0); -- 2.39.2