summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZack Middleton <zturtleman@gmail.com>2012-12-13 23:54:58 +0000
committerTim Angus <tim@ngus.net>2013-01-12 21:24:56 +0000
commitf0ccdf74ef8234be1d8c067515933cbc6be524ac (patch)
treee2ddf667106af5a49ac827c2766797f5947f9117 /src
parent22ea7e12de041f93f2556b678f8b034fb14b2992 (diff)
Fix server ignoring client move commands if voip data is included.
Diffstat (limited to 'src')
-rw-r--r--src/server/sv_client.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/server/sv_client.c b/src/server/sv_client.c
index a6d1e3fb..374dbf49 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -1721,15 +1721,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) );
}