Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-26 09:58:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix assertion failures

Browse source
This commit is contained in:
ehouse 2009-07-31 13:03:38 +00:00
parent fbd3559e3b
commit e746e2bc5b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/common/server.c
View file

@ -1029,7 +1029,6 @@ client_readInitialMessage( ServerCtxt* server, XWStreamCtxt* stream )
/* We should never get this message a second time, but very rarely we do.
Drop it in that case. */
XP_ASSERT( accepted );
if ( accepted ) {
DictionaryCtxt* newDict;
DictionaryCtxt* curDict;
@ -1106,8 +1105,8 @@ client_readInitialMessage( ServerCtxt* server, XWStreamCtxt* stream )
pool = server->pool = pool_make( MPPARM_NOCOMMA(server->mpool) );
pool_initFromDict( server->pool, model_getDictionary(model));
/* now read the assigned tiles for each player from the stream, and remove
them from the newly-created local pool. */
/* now read the assigned tiles for each player from the stream, and
remove them from the newly-created local pool. */
for ( i = 0; i < nPlayers; ++i ) {
TrayTileSet tiles;
@ -1118,7 +1117,8 @@ client_readInitialMessage( ServerCtxt* server, XWStreamCtxt* stream )
model_assignPlayerTiles( model, i, &tiles );
/* remove what the server's assigned so we won't conflict later. */
/* remove what the server's assigned so we won't conflict
later. */
pool_removeTiles( pool, &tiles );
}
@ -1128,7 +1128,8 @@ client_readInitialMessage( ServerCtxt* server, XWStreamCtxt* stream )
players */
setTurn( server, 0 );
} else {
XP_LOGF( "wanted 0; got %d", server->nv.addresses[0].channelNo );
XP_LOGF( "%s: wanted 0; got %d", __func__,
server->nv.addresses[0].channelNo );
}
return accepted;
} /* client_readInitialMessage */