From bf1fcf53a694c58528a1923aeb283f763a7ebede Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 3 Jul 2009 08:31:51 +0000 Subject: [PATCH] CPMA strafe acceleration nerfing: force full QW acceleration while using nerfed strafe acceleration git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7139 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_physics.qc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index b29ae0efd..af8b4d038 100644 --- a/data/qcsrc/server/cl_physics.qc +++ b/data/qcsrc/server/cl_physics.qc @@ -942,27 +942,33 @@ void SV_PlayerPhysics() { 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); -- 2.39.2