]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
add a second trigger for the same incompatibility detection
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 3 Jul 2009 09:11:51 +0000 (09:11 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 3 Jul 2009 09:11:51 +0000 (09:11 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9040 d7cf8633-e32d-0410-b094-e92efae38249

cl_input.c

index 4688041e514820be473c1722a66f05c681a365ad..c8665b31433ab84a26f6fdff47578b4d1c28eab0 100644 (file)
@@ -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;