From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 6 Feb 2007 05:38:08 +0000 (+0000)
Subject: fix very stupid typo in input merging when cl_movement is 0
X-Git-Tag: xonotic-v0.1.0preview~3615
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32f38f8f7f1b91c8c88635e497d9841f84e33d14;p=xonotic%2Fdarkplaces.git

fix very stupid typo in input merging when cl_movement is 0


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6798 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/sv_user.c b/sv_user.c
index de1412c6..3611cb59 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -533,7 +533,7 @@ qboolean SV_ReadClientMove (void)
 	{
 		if (!move->impulse)
 			move->impulse = host_client->cmd.impulse;
-		move->buttons |= host_client->cmd.impulse;
+		move->buttons |= host_client->cmd.buttons;
 	}
 
 	moveframetime = bound(0, move->time - host_client->cmd.time, 0.1);