From 50475fc37b5f5a8da80a02e20e11ecd2da021d4e Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 13 Dec 2012 23:54:58 +0000 Subject: [PATCH] Fix server ignoring client move commands if voip data is included. --- code/server/sv_client.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/server/sv_client.c b/code/server/sv_client.c index 35b434c0..dab4b8b2 100644 --- a/code/server/sv_client.c +++ b/code/server/sv_client.c @@ -1966,15 +1966,19 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) { } } while ( 1 ); + // read optional voip data + if ( c == clc_voip ) { +#ifdef USE_VOIP + SV_UserVoip( cl, msg ); + c = MSG_ReadByte( msg ); +#endif + } + // read the usercmd_t if ( c == clc_move ) { SV_UserMove( cl, msg, qtrue ); } else if ( c == clc_moveNoDelta ) { SV_UserMove( cl, msg, qfalse ); - } else if ( c == clc_voip ) { -#ifdef USE_VOIP - SV_UserVoip( cl, msg ); -#endif } else if ( c != clc_EOF ) { Com_Printf( "WARNING: bad command byte for client %i\n", (int) (cl - svs.clients) ); }