[quake3-commits] r2380 - trunk/code/server

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-12-13 18:54:58 -0500 (Thu, 13 Dec 2012)
New Revision: 2380

Modified:
   trunk/code/server/sv_client.c
Log:
Fix server ignoring client move commands if voip data is included.

Modified: trunk/code/server/sv_client.c
===================================================================
--- trunk/code/server/sv_client.c	2012-12-13 05:25:50 UTC (rev 2379)
+++ trunk/code/server/sv_client.c	2012-12-13 23:54:58 UTC (rev 2380)
@@ -1966,15 +1966,19 @@
 		}
 	} 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) );
 	}