From 6589f62247de55768daca15c4b81f2b751705184 Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Fri, 10 Feb 2006 16:56:13 +0000 Subject: [PATCH] don't allow laser alt-fire to switch to empty rocket launcher git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1005 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/w_laser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/gamec/w_laser.c b/data/qcsrc/server/gamec/w_laser.c index db3a2d40e..3cbf72360 100644 --- a/data/qcsrc/server/gamec/w_laser.c +++ b/data/qcsrc/server/gamec/w_laser.c @@ -12,7 +12,11 @@ void(float req) w_laser = else if (req == WR_FIRE1) weapon_prepareattack(laser_check, laser_check, laser_fire1_01, cvar("g_balance_laser_refire")); else if (req == WR_FIRE2) - self.switchweapon = self.cnt; + { + weapon_hasammo = TRUE; + if (client_hasweapon(self, self.cnt, TRUE)) + self.switchweapon = self.cnt; + } else if (req == WR_RAISE) laser_select_01(); else if (req == WR_UPDATECOUNTS) -- 2.39.2