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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-12-20 03:46:29 -0500 (Sun, 20 Dec 2009)
New Revision: 8435

Modified:
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/extensions.qh
   trunk/data/qcsrc/server/g_subs.qc
Log:
change teleport to animation restart bit in weapon animation


Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-12-20 08:42:41 UTC (rev 8434)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2009-12-20 08:46:29 UTC (rev 8435)
@@ -578,11 +578,12 @@
 		setanim(self, self.anim_idle, TRUE, FALSE, TRUE);
 	}
 
-	tb = (self.effects & EF_TELEPORT_BIT);
+	tb = (self.effects & (EF_TELEPORT_BIT | EF_RESTARTANIM_BIT));
 	self.effects = self.owner.effects & EFMASK_CHEAP;
 	self.effects &~= EF_LOWPRECISION;
 	self.effects &~= EF_FULLBRIGHT; // can mask team color, so get rid of it
 	self.effects &~= EF_TELEPORT_BIT;
+	self.effects &~= EF_RESTARTANIM_BIT;
 	self.effects |= tb;
 
 	if(self.owner.alpha == default_player_alpha)

Modified: trunk/data/qcsrc/server/extensions.qh
===================================================================
--- trunk/data/qcsrc/server/extensions.qh	2009-12-20 08:42:41 UTC (rev 8434)
+++ trunk/data/qcsrc/server/extensions.qh	2009-12-20 08:46:29 UTC (rev 8435)
@@ -175,6 +175,16 @@
 //description:
 //entity emits red light (used for invulnerability)
 
+//DP_EF_RESTARTANIM_BIT
+//idea: id software
+//darkplaces implementation: div0
+//effects bit:
+float   EF_RESTARTANIM_BIT = 1048576;
+//description:
+//when toggled, the current animation is restarted. Useful for weapon animation.
+//to toggle this bit in QC, you can do:
+//  self.effects += (EF_RESTARTANIM_BIT - 2 * (self.effects & EF_RESTARTANIM_BIT));
+
 //DP_EF_STARDUST
 //idea: MythWorks Inc
 //darkplaces implementation: LordHavoc

Modified: trunk/data/qcsrc/server/g_subs.qc
===================================================================
--- trunk/data/qcsrc/server/g_subs.qc	2009-12-20 08:42:41 UTC (rev 8434)
+++ trunk/data/qcsrc/server/g_subs.qc	2009-12-20 08:46:29 UTC (rev 8435)
@@ -24,7 +24,7 @@
 		{
 			if(restart > 0)
 			if(anim_y == 1) // ZYM animation
-				BITXOR_ASSIGN(e.effects, EF_TELEPORT_BIT);
+				BITXOR_ASSIGN(e.effects, EF_RESTARTANIM_BIT);
 		}
 		else
 			return;