X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=4c94d38e61f6c210b45a90cb6c6797cad2d72f3f;hb=f4ff3ba154326d5ef2f087e11d2aec485d798f64;hp=5c4d449d0d71cb792910b2d29ad15c4816399e88;hpb=227c25aca4cde8447e5687168e06e418e2857feb;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index 5c4d449d..4c94d38e 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -1169,18 +1169,23 @@ void CL_ClientMovement_Physics_PM_Accelerate(cl_clientmovement_state_t *s, vec3_
 		// negative: only apply so much sideways friction to stay below the speed you could get by "braking"
 	{
 		vec_t f, fmin;
-		f = 1 - s->cmd.frametime * wishspeed * sidefric;
+		f = max(0, 1 + s->cmd.frametime * wishspeed * sidefric);
 		fmin = (vel_xy_backward*vel_xy_backward - vel_straight*vel_straight) / VectorLength2(vel_perpend);
+		// assume: fmin > 1
+		// vel_xy_backward*vel_xy_backward - vel_straight*vel_straight > vel_perpend*vel_perpend
+		// vel_xy_backward*vel_xy_backward > vel_straight*vel_straight + vel_perpend*vel_perpend
+		// vel_xy_backward*vel_xy_backward > vel_xy * vel_xy
+		// obviously, this cannot be
 		if(fmin <= 0)
 			VectorScale(vel_perpend, f, vel_perpend);
 		else
 		{
 			fmin = sqrt(fmin);
-			VectorScale(vel_perpend, bound(fmin, f, 1.0f), vel_perpend);
+			VectorScale(vel_perpend, max(fmin, f), vel_perpend);
 		}
 	}
 	else
-		VectorScale(vel_perpend, 1 - s->cmd.frametime * wishspeed * sidefric, vel_perpend);
+		VectorScale(vel_perpend, max(0, 1 - s->cmd.frametime * wishspeed * sidefric), vel_perpend);
 
 	VectorMA(vel_perpend, vel_straight, wishdir, s->velocity);
 
@@ -1255,6 +1260,7 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 	vec_t addspeed;
 	vec_t accelspeed;
 	vec_t f;
+	vec_t gravity;
 	vec3_t forward;
 	vec3_t right;
 	vec3_t up;
@@ -1327,11 +1333,20 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 			accelspeed = min(cl.movevars_accelerate * s->cmd.frametime * wishspeed, addspeed);
 			VectorMA(s->velocity, accelspeed, wishdir, s->velocity);
 		}
-		s->velocity[2] -= cl.movevars_gravity * cl.movevars_entgravity * s->cmd.frametime;
+		if(cl.moveflags & MOVEFLAG_NOGRAVITYONGROUND)
+			gravity = 0;
+		else
+			gravity = cl.movevars_gravity * cl.movevars_entgravity * s->cmd.frametime;
+		if(cl.moveflags & MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE)
+			s->velocity[2] -= gravity * 0.5f;
+		else
+			s->velocity[2] -= gravity;
 		if (cls.protocol == PROTOCOL_QUAKEWORLD)
 			s->velocity[2] = 0;
 		if (VectorLength2(s->velocity))
 			CL_ClientMovement_Move(s);
+		if(cl.moveflags & MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE)
+			s->velocity[2] -= gravity * 0.5f;
 	}
 	else
 	{
@@ -1390,8 +1405,14 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 			if(cl.movevars_aircontrol)
 				CL_ClientMovement_Physics_CPM_PM_Aircontrol(s, wishdir, wishspeed2);
 		}
-		s->velocity[2] -= cl.movevars_gravity * cl.movevars_entgravity * s->cmd.frametime;
+		gravity = cl.movevars_gravity * cl.movevars_entgravity * s->cmd.frametime;
+		if(cl.moveflags & MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE)
+			s->velocity[2] -= gravity * 0.5f;
+		else
+			s->velocity[2] -= gravity;
 		CL_ClientMovement_Move(s);
+		if(cl.moveflags & MOVEFLAG_GRAVITYUNAFFECTEDBYTICRATE)
+			s->velocity[2] -= gravity * 0.5f;
 	}
 }