r1712 - branches/nexuiz-2.0/data/qcsrc/server trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jul 3 17:54:54 EDT 2006
Author: kadaverjack
Date: 2006-07-03 17:54:53 -0400 (Mon, 03 Jul 2006)
New Revision: 1712
Modified:
branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
trunk/data/qcsrc/server/w_laser.qc
Log:
don't spam errors on laser alt fire, if previous weapon is invalid
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc 2006-07-03 21:25:38 UTC (rev 1711)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc 2006-07-03 21:54:53 UTC (rev 1712)
@@ -71,8 +71,8 @@
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);
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2006-07-03 21:25:38 UTC (rev 1711)
+++ trunk/data/qcsrc/server/w_laser.qc 2006-07-03 21:54:53 UTC (rev 1712)
@@ -1,3 +1,4 @@
+void(float imp) W_SwitchWeapon;
void W_Laser_Touch (void)
{
@@ -71,8 +72,8 @@
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);
More information about the nexuiz-commits
mailing list