mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-28 09:58:30 +01:00
do a better job of rejecting messages that have strayed in from a
different game; strutils syntax changes.
This commit is contained in:
parent
e627d7f670
commit
4029120fc6
1 changed files with 5 additions and 4 deletions
|
@ -898,7 +898,7 @@ registerRemotePlayer( ServerCtxt* server, XWStreamCtxt* stream )
|
|||
stream_getBytes( stream, name, nameLen );
|
||||
name[nameLen] = '\0';
|
||||
|
||||
replaceStringIfDifferent( MPPARM(server->mpool) &lp->name, name );
|
||||
replaceStringIfDifferent( server->mpool, &lp->name, name );
|
||||
XP_FREE( server->mpool, name );
|
||||
|
||||
channelNo = stream_getAddress( stream );
|
||||
|
@ -974,7 +974,7 @@ client_readInitialMessage( ServerCtxt* server, XWStreamCtxt* stream )
|
|||
|
||||
/* so it's not lost (HACK!). Without this, a client won't have a default
|
||||
dict name when a new game is started. */
|
||||
localGI.dictName = copyString( MPPARM(server->mpool) gi->dictName );
|
||||
localGI.dictName = copyString( server->mpool, gi->dictName );
|
||||
gi_copy( MPPARM(server->mpool) gi, &localGI );
|
||||
|
||||
nCols = localGI.boardSize;
|
||||
|
@ -1606,7 +1606,7 @@ storeBadWords( XP_UCHAR* word, void* closure )
|
|||
XP_STATUSF( "storeBadWords called with \"%s\"", word );
|
||||
|
||||
server->illegalWordInfo.words[server->illegalWordInfo.nWords++]
|
||||
= copyString( MPPARM(server->mpool) word );
|
||||
= copyString( server->mpool, word );
|
||||
|
||||
return XP_TRUE;
|
||||
} /* storeBadWords */
|
||||
|
@ -2288,7 +2288,8 @@ server_receiveMessage( ServerCtxt* server, XWStreamCtxt* incoming )
|
|||
/* break; */
|
||||
|
||||
case XWPROTO_MOVEMADE_INFO_CLIENT: /* client is reporting a move */
|
||||
accepted = reflectMoveAndInform( server, incoming );
|
||||
accepted = (XWSTATE_INTURN == server->nv.gameState)
|
||||
&& reflectMoveAndInform( server, incoming );
|
||||
break;
|
||||
|
||||
case XWPROTO_MOVEMADE_INFO_SERVER: /* server telling me about a move */
|
||||
|
|
Loading…
Reference in a new issue