X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_phys.c;h=f2b515935fd2fd7707da4327e2fb9c4af32c35d3;hp=1669e682c487590f003f7a5585ed32b01cd54808;hb=6ff5802848663ece807c1a425da91d7630a8a036;hpb=365e221966b15c24c6e2f4cbb6e619b0db443ebf

diff --git a/sv_phys.c b/sv_phys.c
index 1669e682..f2b51593 100644
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -1307,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;
@@ -2352,7 +2353,11 @@ static void SV_WalkMove (prvm_edict_t *ent)
 		VectorCopy(PRVM_serveredictvector(ent, maxs), entmaxs);
 		trace = SV_TraceBox(upmove, entmins, entmaxs, downmove, type, ent, SV_GenericHitSuperContentsMask(ent), skipsupercontentsmask, skipmaterialflagsmask, collision_extendmovelength.value);
 		if(trace.fraction < 1 && trace.plane.normal[2] > 0.7)
+		{
 			clip |= 1; // but we HAVE found a floor
+			// set groundentity so we get carried when walking onto a mover with sv_gameplayfix_nogravityonground
+			PRVM_serveredictedict(ent, groundentity) = PRVM_EDICT_TO_PROG(trace.ent);
+		}
 	}
 
 	// if the move did not hit the ground at any point, we're not on ground