From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 11 Sep 2011 12:55:30 +0000 (+0000)
Subject: more canjump fixes
X-Git-Tag: xonotic-v0.6.0~338
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2b477efe100862e343eaa80ab1a2009a0fc5bf4d;p=xonotic%2Fdarkplaces.git

more canjump fixes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11339 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9bb4f792dfd5ccb934dc1bb0bebaac262a0138e1
---

diff --git a/cl_input.c b/cl_input.c
index fee3b1df..fb430089 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -1621,14 +1621,14 @@ void CL_ClientMovement_Replay(void)
 					CL_ClientMovement_PlayerMove(&s);
 				}
 				CL_ClientMovement_PlayerMove(&s);
-				cl.movecmd[i].canjump = s.cmd.canjump;
 			}
 			else
 			{
 				// we REALLY need this handling to happen, even if the move is not executed
-				if (!cl.movecmd[i].jump)
-					cl.movecmd[i].canjump = true;
+				if (!s.cmd.jump)
+					s.cmd.canjump = true;
 			}
+			cl.movecmd[i].canjump = s.cmd.canjump;
 		}
 		//Con_Printf("\n");
 		CL_ClientMovement_UpdateStatus(&s);
@@ -1837,7 +1837,6 @@ void CL_SendMove(void)
 		cl.cmd.forwardmove = cl.cmd.sidemove = cl.cmd.upmove = cl.cmd.impulse = cl.cmd.buttons = 0;
 
 	cl.cmd.jump = (cl.cmd.buttons & 2) != 0;
-	cl.cmd.canjump = cl.movecmd[0].canjump;
 	cl.cmd.crouch = 0;
 	switch (cls.protocol)
 	{