Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

call util_informMissing when the pendingPlayers count drops to 0

Browse source
This commit is contained in:
Eric House 2014-09-25 06:36:07 -07:00
parent abf12e90da
commit aa566ad1f0
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/common/server.c
View file

@ -375,6 +375,15 @@ writeStreamIf( XWStreamCtxt* dest, XWStreamCtxt* src )
} }
} }
static void
informMissing( const ServerCtxt* server )
{
XP_Bool isServer = amServer( server );
util_informMissing( server->vol.util, isServer,
comms_getConType( server->vol.comms ),
isServer ? server->nv.pendingRegistrations : 0 );
}
ServerCtxt* ServerCtxt*
server_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model, server_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,
CommsCtxt* comms, XW_UtilCtxt* util, XP_U16 nPlayers ) CommsCtxt* comms, XW_UtilCtxt* util, XP_U16 nPlayers )
@ -416,9 +425,7 @@ server_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,
server->nv.prevWordsStream = readStreamIf( server, stream ); server->nv.prevWordsStream = readStreamIf( server, stream );
} }
XP_Bool isServer = amServer( server ); informMissing( server );
util_informMissing( util, isServer, comms_getConType( comms ),
isServer ? server->nv.pendingRegistrations : 0 );
return server; return server;
} /* server_makeFromStream */ } /* server_makeFromStream */
@ -701,6 +708,8 @@ handleRegistrationMsg( ServerCtxt* server, XWStreamCtxt* stream )
XP_ASSERT( playersInMsg > 0 ); XP_ASSERT( playersInMsg > 0 );
if ( server->nv.pendingRegistrations < playersInMsg ) { if ( server->nv.pendingRegistrations < playersInMsg ) {
XP_LOGF( "%s: got %d players but missing only %d", __func__,
playersInMsg, server->nv.pendingRegistrations );
util_userError( server->vol.util, ERR_REG_UNEXPECTED_USER ); util_userError( server->vol.util, ERR_REG_UNEXPECTED_USER );
success = XP_FALSE; success = XP_FALSE;
} else { } else {
@ -745,6 +754,8 @@ handleRegistrationMsg( ServerCtxt* server, XWStreamCtxt* stream )
checkResizeBoard( server ); checkResizeBoard( server );
assignTilesToAll( server ); assignTilesToAll( server );
SETSTATE( server, XWSTATE_RECEIVED_ALL_REG ); SETSTATE( server, XWSTATE_RECEIVED_ALL_REG );
informMissing( server );
} }
} }