r5563 - trunk/data/qcsrc/client

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Jan 16 03:12:06 EST 2009


Author: div0
Date: 2009-01-16 03:12:06 -0500 (Fri, 16 Jan 2009)
New Revision: 5563

Modified:
   trunk/data/qcsrc/client/movetypes.qc
   trunk/data/qcsrc/client/movetypes.qh
   trunk/data/qcsrc/client/projectile.qc
Log:
support move_avelocity too


Modified: trunk/data/qcsrc/client/movetypes.qc
===================================================================
--- trunk/data/qcsrc/client/movetypes.qc	2009-01-16 08:09:32 UTC (rev 5562)
+++ trunk/data/qcsrc/client/movetypes.qc	2009-01-16 08:12:06 UTC (rev 5563)
@@ -136,7 +136,7 @@
 		self.move_velocity_z -= dt * self.gravity * getstatf(STAT_MOVEVARS_GRAVITY);
 	}
 
-	self.move_angles = self.move_angles + self.avelocity * dt;
+	self.move_angles = self.move_angles + self.move_avelocity * dt;
 
 	vector move;
 	move = self.move_velocity * dt;
@@ -171,7 +171,7 @@
 				self.move_flags |= FL_ONGROUND;
 				self.move_groundentity = trace_ent;
 				self.move_velocity = '0 0 0';
-				self.avelocity = '0 0 0';
+				self.move_avelocity = '0 0 0';
 			}
 			else
 				self.move_flags &~= FL_ONGROUND;
@@ -186,7 +186,7 @@
 				if(trace_ent.solid == SOLID_BSP)
 					self.move_suspendedinair = TRUE;
 				self.move_velocity = '0 0 0';
-				self.avelocity = '0 0 0';
+				self.move_avelocity = '0 0 0';
 			}
 			else
 				self.move_flags &~= FL_ONGROUND;
@@ -237,7 +237,7 @@
 			case MOVETYPE_NOCLIP:
 				_Movetype_CheckWater();
 				self.move_origin = self.move_origin + ticrate * self.move_velocity;
-				self.move_angles = self.move_angles + ticrate * self.avelocity;
+				self.move_angles = self.move_angles + ticrate * self.move_avelocity;
 				_Movetype_LinkEdict(FALSE);
 				break;
 			case MOVETYPE_STEP:
@@ -256,6 +256,8 @@
 		}
 	}
 
+	self.avelocity = self.move_avelocity;
+
 	if(dt > 0)
 	{
 		// now continue the move from move_time to time

Modified: trunk/data/qcsrc/client/movetypes.qh
===================================================================
--- trunk/data/qcsrc/client/movetypes.qh	2009-01-16 08:09:32 UTC (rev 5562)
+++ trunk/data/qcsrc/client/movetypes.qh	2009-01-16 08:12:06 UTC (rev 5563)
@@ -4,6 +4,7 @@
 .vector move_origin;
 .vector move_angles;
 .vector move_velocity;
+.vector move_avelocity;
 
 void Movetype_Physics(float matchserver);
 

Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-01-16 08:09:32 UTC (rev 5562)
+++ trunk/data/qcsrc/client/projectile.qc	2009-01-16 08:12:06 UTC (rev 5563)
@@ -54,7 +54,6 @@
 void Ent_Projectile()
 {
 	float f;
-	float sz;
 
 	InterpolateOrigin_Undo();
 




More information about the nexuiz-commits mailing list