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

add server_getMissingPlayers to return a bitvector indicating players

Browse source 
not yet received on device.  Meant to be included in summary.  I'm not
happy with how much code it took to figure this.  I don't know
server.c all that well any more.
This commit is contained in:
Andy2 2011-05-19 22:48:21 -07:00
parent 0f45c26aea
commit 89911ecaa4
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
xwords4/common/server.c
View file

@ -1016,7 +1016,8 @@ registerRemotePlayer( ServerCtxt* server, XWStreamCtxt* stream )
}
player->deviceIndex = deviceIndex;
XP_LOGF( "%s: set deviceIndex[%d]=%d", __func__,
player - server->players, deviceIndex );
} /* registerRemotePlayer */
static void
@ -2137,6 +2138,46 @@ server_getGameIsOver( ServerCtxt* server )
return server->nv.gameState == XWSTATE_GAMEOVER;
} /* server_getGameIsOver */
XP_U16
server_getMissingPlayers( const ServerCtxt* server )
{
/* list players for which we're reserving slots that haven't shown up yet.
* If I'm a guest and haven't received the registration message and set
* server->nv.addresses[0].channelNo, all non-local players are missing.
* If I'm a host, players whose deviceIndex is -1 are missing.
*/
XP_U16 result = 0;
XP_U16 ii;
if ( SERVER_ISCLIENT == server->vol.gi->serverRole ) {
if ( 0 == server->nv.addresses[0].channelNo ) {
CurGameInfo* gi = server->vol.gi;
const LocalPlayer* lp = gi->players;
for ( ii = 0; ii < gi->nPlayers; ++ii ) {
if ( !lp->isLocal ) {
result |= 1 << ii;
}
++lp;
}
}
} else {
XP_ASSERT( SERVER_ISSERVER == server->vol.gi->serverRole );
if ( 0 < server->nv.pendingRegistrations ) {
XP_U16 nPlayers = server->vol.gi->nPlayers;
const ServerPlayer* players = server->players;
for ( ii = 0; ii < nPlayers; ++ii ) {
if ( players->deviceIndex == UNKNOWN_DEVICE ) {
result |= 1 << ii;
}
++players;
}
}
}
LOG_RETURNF( "%x", result );
return result;
}
static void
doEndGame( ServerCtxt* server )
{

2
xwords4/common/server.h
View file

@ -93,6 +93,8 @@ XP_Bool server_handleUndo( ServerCtxt* server );
/* signed because negative number means nobody's turn yet */
XP_S16 server_getCurrentTurn( ServerCtxt* server );
XP_Bool server_getGameIsOver( ServerCtxt* server );
/* return bitvector marking players still not arrived in networked game */
XP_U16 server_getMissingPlayers( const ServerCtxt* server );
/* Signed in case no dictionary available */
XP_S16 server_countTilesInPool( ServerCtxt* server );