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

Merge remote-tracking branch 'origin/android_branch' into android_branch

Browse source
This commit is contained in:
Eric House 2012-10-26 07:06:59 -07:00
commit e1fa0f9dd3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/common/server.c
View file

@ -2429,6 +2429,7 @@ server_getLastMoveTime( const ServerCtxt* server )
static void static void
doEndGame( ServerCtxt* server, XP_S16 quitter ) doEndGame( ServerCtxt* server, XP_S16 quitter )
{ {
XP_ASSERT( quitter < server->vol.gi->nPlayers );
SETSTATE( server, XWSTATE_GAMEOVER ); SETSTATE( server, XWSTATE_GAMEOVER );
setTurn( server, -1 ); setTurn( server, -1 );
server->nv.quitter = quitter; server->nv.quitter = quitter;
@ -2445,7 +2446,7 @@ putQuitter( const ServerCtxt* server, XWStreamCtxt* stream, XP_S16 quitter )
} }
static void static void
getQuitter( const ServerCtxt* server, XWStreamCtxt* stream, XP_S16* quitter ) getQuitter( const ServerCtxt* server, XWStreamCtxt* stream, XP_S8* quitter )
{ {
*quitter = STREAM_VERS_DICTNAME <= server->nv.streamVersion *quitter = STREAM_VERS_DICTNAME <= server->nv.streamVersion
? stream_getU8( stream ) : -1; ? stream_getU8( stream ) : -1;
@ -2462,6 +2463,7 @@ static void
endGameInternal( ServerCtxt* server, GameEndReason XP_UNUSED(why), XP_S16 quitter ) endGameInternal( ServerCtxt* server, GameEndReason XP_UNUSED(why), XP_S16 quitter )
{ {
XP_ASSERT( server->nv.gameState != XWSTATE_GAMEOVER ); XP_ASSERT( server->nv.gameState != XWSTATE_GAMEOVER );
XP_ASSERT( quitter < server->vol.gi->nPlayers );
if ( server->vol.gi->serverRole != SERVER_ISCLIENT ) { if ( server->vol.gi->serverRole != SERVER_ISCLIENT ) {
@ -2756,7 +2758,7 @@ server_receiveMessage( ServerCtxt* server, XWStreamCtxt* incoming )
XP_FREE( server->mpool, msg ); XP_FREE( server->mpool, msg );
#endif #endif
} else if ( readStreamHeader( server, incoming ) ) { } else if ( readStreamHeader( server, incoming ) ) {
XP_S16 quitter; XP_S8 quitter;
switch( code ) { switch( code ) {
/* case XWPROTO_MOVEMADE_INFO: */ /* case XWPROTO_MOVEMADE_INFO: */
/* accepted = client_reflectMoveMade( server, incoming ); */ /* accepted = client_reflectMoveMade( server, incoming ); */

1
xwords4/linux/linuxmain.c
View file

@ -216,6 +216,7 @@ void
catFinalScores( const CommonGlobals* cGlobals, XP_S16 quitter ) catFinalScores( const CommonGlobals* cGlobals, XP_S16 quitter )
{ {
XWStreamCtxt* stream; XWStreamCtxt* stream;
XP_ASSERT( quitter < cGlobals->params->gi.nPlayers );
stream = mem_stream_make( MPPARM(cGlobals->params->util->mpool) stream = mem_stream_make( MPPARM(cGlobals->params->util->mpool)
cGlobals->params->vtMgr, cGlobals->params->vtMgr,