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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Fri Jul 3 04:31:53 EDT 2009


Author: div0
Date: 2009-07-03 04:31:51 -0400 (Fri, 03 Jul 2009)
New Revision: 7139

Modified:
   trunk/data/qcsrc/server/cl_physics.qc
Log:
CPMA strafe acceleration nerfing: force full QW acceleration while using nerfed strafe acceleration


Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc	2009-07-02 07:34:49 UTC (rev 7138)
+++ trunk/data/qcsrc/server/cl_physics.qc	2009-07-03 08:31:51 UTC (rev 7139)
@@ -942,27 +942,33 @@
 		{
 			float accelerating;
 			float wishspeed2;
+			float airaccelqw;
 
+			airaccelqw = sv_airaccel_qw;
 			accelerating = (self.velocity * wishdir > 0);
 			wishspeed2 = wishspeed;
 
 			// CPM
 			if(sv_airstopaccelerate)
 				if(self.velocity * wishdir < 0)
-					airaccel = sv_airstopaccelerate;
+					airaccel = sv_airstopaccelerate*maxspd_mod;
 			if(self.movement_x == 0 && self.movement_y != 0)
 			{
 				if(sv_maxairstrafespeed)
-					wishspeed = min(wishspeed, sv_maxairstrafespeed);
+					wishspeed = min(wishspeed, sv_maxairstrafespeed*maxspd_mod);
 				if(sv_airstrafeaccelerate)
-					airaccel = sv_airstrafeaccelerate;
+				{
+					airaccel = sv_airstrafeaccelerate*maxspd_mod;
+					if(sv_airstrafeaccelerate > sv_airaccelerate)
+						airaccelqw = 1;
+				}
 			}
 			// !CPM
 
 			if(sv_warsowbunny_turnaccel && accelerating && self.movement_y == 0 && self.movement_x != 0)
 				PM_AirAccelerate(wishdir, wishspeed);
 			else
-				PM_Accelerate(wishdir, wishspeed, airaccel, sv_airaccel_qw, sv_airaccel_sideways_friction / maxairspd);
+				PM_Accelerate(wishdir, wishspeed, airaccel, airaccelqw, sv_airaccel_sideways_friction / maxairspd);
 
 			if(sv_aircontrol)
 				CPM_PM_Aircontrol(wishdir, wishspeed2);



More information about the nexuiz-commits mailing list