From f51b6bbff6387091705a1ffef50883b17d01daca Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Sat, 1 Jul 2006 11:57:24 +0000
Subject: [PATCH] sync pmove stuff again

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2338 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/common/pmove.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engine/common/pmove.c b/engine/common/pmove.c
index b525c5d60..655ccaa4e 100644
--- a/engine/common/pmove.c
+++ b/engine/common/pmove.c
@@ -269,7 +269,7 @@ int PM_StepSlideMove (qboolean in_air)
 		if (!(blocked & BLOCKED_STEP))
 			return blocked;
 
-		org = (pmove.velocity < 0) ? pmove.origin : original;	// cryptic, eh?
+		org = (originalvel[2] < 0) ? pmove.origin : original;
 		VectorCopy (org, dest);
 		dest[2] -= pm_stepheight;
 		trace = PM_PlayerTrace (org, dest);
@@ -298,6 +298,9 @@ int PM_StepSlideMove (qboolean in_air)
 		VectorCopy (trace.endpos, pmove.origin);
 	}
 
+	if (in_air && originalvel[2] < 0)
+		pmove.velocity[2] = 0;
+
 	PM_SlideMove ();
 
 // press down the stepheight