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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-08-18 12:08:45 -0400 (Tue, 18 Aug 2009)
New Revision: 7461

Modified:
   trunk/data/qcsrc/server/cl_physics.qc
   trunk/data/qcsrc/server/cl_player.qc
Log:
restart jump anim when needed


Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2009-08-18 07:59:02 UTC (rev 7460)
+++ trunk/data/qcsrc/server/cl_physics.qc	2009-08-18 16:08:45 UTC (rev 7461)
@@ -1,4 +1,5 @@
 .float race_penalty;
+.float restart_jump;
 
 float sv_accelerate;
 float sv_friction;
@@ -127,6 +128,8 @@
 		// for 4 units, and constant velocity
 		self.doublejump_nextjumptime = time + 4 / max(40, self.velocity_z); // max 0.1s blocking of jumps
 	}
+
+	self.restart_jump = TRUE; // restart jump anim next time
 }
 
 void CheckWaterJump()

Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc	2009-08-18 07:59:02 UTC (rev 7460)
+++ trunk/data/qcsrc/server/cl_player.qc	2009-08-18 16:08:45 UTC (rev 7461)
@@ -222,9 +222,10 @@
 		if (!(self.flags & FL_ONGROUND))
 		{
 			if (self.crouch)
-				setanim(self, self.anim_duckjump, FALSE, TRUE, FALSE);
+				setanim(self, self.anim_duckjump, FALSE, TRUE, self.restart_jump);
 			else
-				setanim(self, self.anim_jump, FALSE, TRUE, FALSE);
+				setanim(self, self.anim_jump, FALSE, TRUE, self.restart_jump);
+			self.restart_jump = FALSE;
 		}
 		else if (self.crouch)
 		{