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

cleanup/refactor

Browse source
This commit is contained in:
Eric House 2023-12-23 07:13:06 -08:00
parent f2c1f21da2
commit ffc64bc5dd
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
xwords4/common/server.c
View file

@ -225,7 +225,8 @@ static void badWordMoveUndoAndTellUser( ServerCtxt* server, XWEnv xwe,
BadWordInfo* bwi ); BadWordInfo* bwi );
static XP_Bool tileCountsOk( const ServerCtxt* server ); static XP_Bool tileCountsOk( const ServerCtxt* server );
static void setTurn( ServerCtxt* server, XWEnv xwe, XP_S16 turn ); static void setTurn( ServerCtxt* server, XWEnv xwe, XP_S16 turn );
static XWStreamCtxt* mkServerStream( const ServerCtxt* server ); static XWStreamCtxt* mkServerStream( const ServerCtxt* server, XP_U8 version );
static XWStreamCtxt* mkServerStream0( const ServerCtxt* server );
static void fetchTiles( ServerCtxt* server, XWEnv xwe, XP_U16 playerNum, static void fetchTiles( ServerCtxt* server, XWEnv xwe, XP_U16 playerNum,
XP_U16 nToFetch, const TrayTileSet* tradedTiles, XP_U16 nToFetch, const TrayTileSet* tradedTiles,
TrayTileSet* resultTiles, XP_Bool forceCanPlay ); TrayTileSet* resultTiles, XP_Bool forceCanPlay );
@ -531,7 +532,7 @@ readStreamIf( ServerCtxt* server, XWStreamCtxt* in )
XWStreamCtxt* result = NULL; XWStreamCtxt* result = NULL;
XP_U16 len = stream_getU16( in ); XP_U16 len = stream_getU16( in );
if ( 0 < len ) { if ( 0 < len ) {
result = mkServerStream( server ); result = mkServerStream0( server );
stream_getFromStream( result, in, len ); stream_getFromStream( result, in, len );
} }
return result; return result;
@ -896,8 +897,7 @@ buildGuestRI( const ServerCtxt* server, XP_U16 guestIndex, RematchInfo* rip )
static void static void
loadRemoteRI( const ServerCtxt* server, const CurGameInfo* gi, RematchInfo* rip ) loadRemoteRI( const ServerCtxt* server, const CurGameInfo* gi, RematchInfo* rip )
{ {
XWStreamCtxt* tmpStream = mkServerStream( server ); XWStreamCtxt* tmpStream = mkServerStream( server, server->nv.streamVersion );
stream_setVersion( tmpStream, server->nv.streamVersion );
stream_putBytes( tmpStream, server->nv.rematch.addrs, server->nv.rematch.addrsLen ); stream_putBytes( tmpStream, server->nv.rematch.addrs, server->nv.rematch.addrsLen );
ri_fromStream( rip, tmpStream, server ); ri_fromStream( rip, tmpStream, server );
@ -921,8 +921,7 @@ addGuestAddrsIf( const ServerCtxt* server, XP_U16 sendee, XWStreamCtxt* stream )
if ( STREAM_VERS_REMATCHADDRS <= version if ( STREAM_VERS_REMATCHADDRS <= version
/* Not needed for two-device games */ /* Not needed for two-device games */
&& 2 < server->nv.nDevices ) { && 2 < server->nv.nDevices ) {
XWStreamCtxt* tmpStream = mkServerStream( server ); XWStreamCtxt* tmpStream = mkServerStream( server, version );
stream_setVersion( tmpStream, version );
XP_Bool skipIt = XP_FALSE; XP_Bool skipIt = XP_FALSE;
if ( STREAM_VERS_REMATCHORDER <= version ) { if ( STREAM_VERS_REMATCHORDER <= version ) {
@ -967,8 +966,7 @@ readGuestAddrs( ServerCtxt* server, XWStreamCtxt* stream, XP_U8 streamVersion )
stream_getBytes( stream, server->nv.rematch.addrs, len ); stream_getBytes( stream, server->nv.rematch.addrs, len );
XP_LOGFF( "loaded %d bytes of rematch.addrs", len ); XP_LOGFF( "loaded %d bytes of rematch.addrs", len );
#ifdef DEBUG #ifdef DEBUG
XWStreamCtxt* tmpStream = mkServerStream( server ); XWStreamCtxt* tmpStream = mkServerStream( server, streamVersion );
stream_setVersion( tmpStream, streamVersion );
stream_putBytes( tmpStream, server->nv.rematch.addrs, stream_putBytes( tmpStream, server->nv.rematch.addrs,
server->nv.rematch.addrsLen ); server->nv.rematch.addrsLen );
@ -1263,7 +1261,7 @@ dupe_setupShowTrade( ServerCtxt* server, XWEnv xwe, XP_U16 nTiles )
const XP_UCHAR* fmt = dutil_getUserString( server->vol.dutil, xwe, STRD_DUP_TRADED ); const XP_UCHAR* fmt = dutil_getUserString( server->vol.dutil, xwe, STRD_DUP_TRADED );
XP_SNPRINTF( buf, VSIZE(buf), fmt, nTiles ); XP_SNPRINTF( buf, VSIZE(buf), fmt, nTiles );
XWStreamCtxt* stream = mkServerStream( server ); XWStreamCtxt* stream = mkServerStream0( server );
stream_catString( stream, buf ); stream_catString( stream, buf );
server->nv.prevMoveStream = stream; server->nv.prevMoveStream = stream;
@ -1279,7 +1277,7 @@ dupe_setupShowMove( ServerCtxt* server, XWEnv xwe, XP_U16* scores )
const CurGameInfo* gi = server->vol.gi; const CurGameInfo* gi = server->vol.gi;
const XP_U16 nPlayers = gi->nPlayers; const XP_U16 nPlayers = gi->nPlayers;
XWStreamCtxt* stream = mkServerStream( server ); XWStreamCtxt* stream = mkServerStream0( server );
XP_U16 lastMax = 0x7FFF; XP_U16 lastMax = 0x7FFF;
for ( XP_U16 nDone = 0; nDone < nPlayers; ) { for ( XP_U16 nDone = 0; nDone < nPlayers; ) {
@ -1620,12 +1618,19 @@ robotTradeTiles( ServerCtxt* server, MoveInfo* newMove )
#endif #endif
static XWStreamCtxt* static XWStreamCtxt*
mkServerStream( const ServerCtxt* server ) mkServerStream0( const ServerCtxt* server )
{
return mkServerStream( server, 0 );
}
static XWStreamCtxt*
mkServerStream( const ServerCtxt* server, XP_U8 version )
{ {
XWStreamCtxt* stream = XWStreamCtxt* stream =
mem_stream_make_raw( MPPARM(server->mpool) mem_stream_make_raw( MPPARM(server->mpool)
dutil_getVTManager(server->vol.dutil) ); dutil_getVTManager(server->vol.dutil) );
XP_ASSERT( !!stream ); XP_ASSERT( !!stream );
stream_setVersion( stream, version );
return stream; return stream;
} /* mkServerStream */ } /* mkServerStream */
@ -1696,7 +1701,7 @@ makeRobotMove( ServerCtxt* server, XWEnv xwe )
server->vol.showPrevMove = XP_TRUE; server->vol.showPrevMove = XP_TRUE;
if ( inDuplicateMode(server) || server->nv.showRobotScores ) { if ( inDuplicateMode(server) || server->nv.showRobotScores ) {
stream = mkServerStream( server ); stream = mkServerStream0( server );
} }
/* trade if unable to find a move */ /* trade if unable to find a move */
@ -1736,7 +1741,7 @@ makeRobotMove( ServerCtxt* server, XWEnv xwe )
newMove.nTiles, turn ); newMove.nTiles, turn );
if ( !!stream ) { if ( !!stream ) {
XWStreamCtxt* wordsStream = mkServerStream( server ); XWStreamCtxt* wordsStream = mkServerStream0( server );
WordNotifierInfo* ni = WordNotifierInfo* ni =
model_initWordCounter( model, wordsStream ); model_initWordCounter( model, wordsStream );
(void)model_checkMoveLegal( model, xwe, turn, stream, ni ); (void)model_checkMoveLegal( model, xwe, turn, stream, ni );
@ -1839,7 +1844,7 @@ showPrevScore( ServerCtxt* server, XWEnv xwe )
XP_SNPRINTF( buf, sizeof(buf), str, lp->name ); XP_SNPRINTF( buf, sizeof(buf), str, lp->name );
str = buf; str = buf;
stream = mkServerStream( server ); stream = mkServerStream0( server );
stream_catString( stream, str ); stream_catString( stream, str );
XWStreamCtxt* prevStream = server->nv.prevMoveStream; XWStreamCtxt* prevStream = server->nv.prevMoveStream;
@ -3212,7 +3217,7 @@ makeTradeReportIf( ServerCtxt* server, XWEnv xwe, const TrayTileSet* tradedTiles
tradedTiles->nTiles ); tradedTiles->nTiles );
XP_SNPRINTF( tradeBuf, sizeof(tradeBuf), tradeStr, XP_SNPRINTF( tradeBuf, sizeof(tradeBuf), tradeStr,
tradedTiles->nTiles ); tradedTiles->nTiles );
stream = mkServerStream( server ); stream = mkServerStream0( server );
stream_catString( stream, tradeBuf ); stream_catString( stream, tradeBuf );
} }
return stream; return stream;
@ -3224,8 +3229,8 @@ makeMoveReportIf( ServerCtxt* server, XWEnv xwe, XWStreamCtxt** wordsStream )
XWStreamCtxt* stream = NULL; XWStreamCtxt* stream = NULL;
if ( inDuplicateMode(server) || server->nv.showRobotScores ) { if ( inDuplicateMode(server) || server->nv.showRobotScores ) {
ModelCtxt* model = server->vol.model; ModelCtxt* model = server->vol.model;
stream = mkServerStream( server ); stream = mkServerStream0( server );
*wordsStream = mkServerStream( server ); *wordsStream = mkServerStream0( server );
WordNotifierInfo* ni = model_initWordCounter( model, *wordsStream ); WordNotifierInfo* ni = model_initWordCounter( model, *wordsStream );
(void)model_checkMoveLegal( model, xwe, server->nv.currentTurn, stream, ni ); (void)model_checkMoveLegal( model, xwe, server->nv.currentTurn, stream, ni );
} }