From 32f38f8f7f1b91c8c88635e497d9841f84e33d14 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 6 Feb 2007 05:38:08 +0000
Subject: [PATCH] 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
---
 sv_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.39.2