[nexuiz-commits] r7976 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-28 10:55:15 -0400 (Mon, 28 Sep 2009)
New Revision: 7976

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
Log:
fix weapon anim glitch on intermission


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-09-28 14:08:24 UTC (rev 7975)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-09-28 14:55:15 UTC (rev 7976)
@@ -645,7 +645,7 @@
 	self.angles = '0 0 0';
 	local float f;
 	f = 0;
-	if (self.state == WS_RAISE)
+	if (self.state == WS_RAISE && !intermission_running)
 	{
 		f = (self.owner.weapon_nextthink - time) * g_weaponratefactor / cvar("g_balance_weaponswitchdelay");
 		self.angles_x = -90 * f * f;
@@ -655,7 +655,7 @@
 			setorigin(self, QCWEAPONANIMATION_ORIGIN(self));
 		}
 	}
-	else if (self.state == WS_DROP)
+	else if (self.state == WS_DROP && !intermission_running)
 	{
 		f = 1 - (self.owner.weapon_nextthink - time) * g_weaponratefactor / cvar("g_balance_weaponswitchdelay");
 		self.angles_x = -90 * f * f;