From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 3 Jul 2009 09:11:51 +0000 (+0000)
Subject: add a second trigger for the same incompatibility detection
X-Git-Tag: xonotic-v0.1.0preview~1587
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b190f99e00e475fa3a92395bfa2e44e0cdb54b8a;p=xonotic%2Fdarkplaces.git

add a second trigger for the same incompatibility detection


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9040 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/cl_input.c b/cl_input.c
index 4688041e..c8665b31 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -1215,8 +1215,15 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 			if(s->cmd.forwardmove == 0 && s->cmd.sidemove != 0)
 			{
 				if(cl.movevars_maxairstrafespeed)
+				{
 					if(wishspeed > cl.movevars_maxairstrafespeed)
 						wishspeed = cl.movevars_maxairstrafespeed;
+					if(cl.movevars_maxairstrafespeed < cl.movevars_maxairspeed)
+						accelqw = 1;
+						// otherwise, CPMA-style air acceleration misbehaves a lot
+						// if partially non-QW acceleration is used (as in, strafing
+						// would get faster than moving forward straight)
+				}
 				if(cl.movevars_airstrafeaccelerate)
 				{
 					accel = cl.movevars_airstrafeaccelerate;