diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 12:04:29 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:39 +0000 |
| commit | a8d7e1110216c7d530c3fe6939d3e734a44f16ef (patch) | |
| tree | 0ffac1cc5f0856fe85b2e7c558237f341edf73d0 /src/cgame | |
| parent | c29de5a7d5984c27fd85305aaab69e8d88db6d71 (diff) | |
* More testing code to fix ready state
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index d48800fa..d8683d9e 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -1425,14 +1425,18 @@ static clientInfo_t * CG_InfoFromScoreIndex( int index, int team, int *scoreInde static qboolean CG_ClientIsReady( int clientNum ) { + // each character of the hex string corresponds to 4 bits, which correspond + // to readiness for client (0, 1, 2, 3...) i.e. the highest order bit + // corresponds to the lowest clientnum + // because of this 1:4 ratio we only need one character for a given client int val = clientNum / 4; const char *s = CG_ConfigString( CS_CLIENTS_READY ); - while( *s && val-- ) + while( *s && val-- > 0 ) s++; if( !*s ) return qfalse; sscanf( s, "%1x", &val ); - return ( ( val & ( clientNum % 4 ) ) != 0 ); + return ( ( val & 1 << ( 3 - clientNum % 4 ) ) != 0 ); } static const char *CG_FeederItemText( float feederID, int index, int column, qhandle_t *handle ) |