X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_phys.c;h=f2b515935fd2fd7707da4327e2fb9c4af32c35d3;hp=b26ebe225e90f6020e8411a7d6491565605a320b;hb=f02aede58fe2b44b1eba101a09bdef4c99222d32;hpb=7ea07939bef0cbe85c54d9f68cb924198b0b1f64

diff --git a/sv_phys.c b/sv_phys.c
index b26ebe22..f2b51593 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1255,6 +1255,9 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float
 
 		if (trace.fraction == 1)
 			break;
+
+		time_left *= 1 - trace.fraction;
+
 		if (trace.plane.normal[2])
 		{
 			if (trace.plane.normal[2] > 0.7)
@@ -1282,6 +1285,7 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float
 			trace_t steptrace3;
 			//Con_Printf("step %f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]);
 			VectorSet(steppush, 0, 0, stepheight);
+			VectorScale(PRVM_serveredictvector(ent, velocity), time_left, push);
 			VectorCopy(PRVM_serveredictvector(ent, origin), org);
 			if(!SV_PushEntity(&steptrace, ent, steppush, false))
 			{
@@ -1303,7 +1307,8 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float
 			}
 			//Con_Printf("%f %f %f : ", PRVM_serveredictvector(ent, origin)[0], PRVM_serveredictvector(ent, origin)[1], PRVM_serveredictvector(ent, origin)[2]);
 			// accept the new position if it made some progress...
-			if (fabs(PRVM_serveredictvector(ent, origin)[0] - org[0]) >= 0.03125 || fabs(PRVM_serveredictvector(ent, origin)[1] - org[1]) >= 0.03125)
+			// previously this checked if absolute distance >= 0.03125 which made stepping up unreliable
+			if (PRVM_serveredictvector(ent, origin)[0] - org[0] || PRVM_serveredictvector(ent, origin)[1] - org[1])
 			{
 				//Con_Printf("accepted (delta %f %f %f)\n", PRVM_serveredictvector(ent, origin)[0] - org[0], PRVM_serveredictvector(ent, origin)[1] - org[1], PRVM_serveredictvector(ent, origin)[2] - org[2]);
 				trace = steptrace2;
@@ -1333,8 +1338,6 @@ static int SV_FlyMove (prvm_edict_t *ent, float time, qbool applygravity, float
 			numplanes = 0;
 		}
 
-		time_left *= 1 - trace.fraction;
-
 		// clipped to another plane
 		if (numplanes >= MAX_CLIP_PLANES)
 		{