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

fix release build

Browse source
This commit is contained in:
Eric House 2020-01-30 17:51:44 -08:00
parent 12c38ab60c
commit 845dea6eec
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
xwords4/common/game.c
View file

@ -90,8 +90,7 @@ timerChangeListener( void* data, const XP_U32 gameID,
XP_S32 oldVal, XP_S32 newVal ) XP_S32 oldVal, XP_S32 newVal )
{ {
XWGame* game = (XWGame*)data; XWGame* game = (XWGame*)data;
const CurGameInfo* gi = game->util->gameInfo; XP_ASSERT( game->util->gameInfo->gameID == gameID );
XP_ASSERT( gi->gameID == gameID );
XP_LOGF( "%s(oldVal=%d, newVal=%d, id=%d)", __func__, oldVal, newVal, gameID ); XP_LOGF( "%s(oldVal=%d, newVal=%d, id=%d)", __func__, oldVal, newVal, gameID );
dutil_onDupTimerChanged( util_getDevUtilCtxt( game->util ), dutil_onDupTimerChanged( util_getDevUtilCtxt( game->util ),
gameID, oldVal, newVal ); gameID, oldVal, newVal );

4
xwords4/common/memstream.c
View file

@ -404,7 +404,7 @@ mem_stream_getHash( const XWStreamCtxt* p_sctx, XWStreamPos pos,
--len; --len;
} }
log_hex( ptr, len, __func__ ); LOG_HEX( ptr, len, __func__ );
hash = augmentHash( 0, ptr, len ); hash = augmentHash( 0, ptr, len );
if ( 0 != bits ) { if ( 0 != bits ) {
@ -415,7 +415,7 @@ mem_stream_getHash( const XWStreamCtxt* p_sctx, XWStreamPos pos,
byt &= 1 << bits; byt &= 1 << bits;
} }
hash = augmentHash( hash, &byt, 1 ); hash = augmentHash( hash, &byt, 1 );
log_hex( &byt, 1, __func__ ); LOG_HEX( &byt, 1, __func__ );
} }
hash = finishHash( hash ); hash = finishHash( hash );

4
xwords4/common/server.c
View file

@ -3493,8 +3493,6 @@ static XP_Bool
commitMoveImpl( ServerCtxt* server, XP_U16 player, TrayTileSet* newTilesP, commitMoveImpl( ServerCtxt* server, XP_U16 player, TrayTileSet* newTilesP,
XP_Bool forced ) XP_Bool forced )
{ {
ModelCtxt* model = server->vol.model;
CurGameInfo* gi = server->vol.gi;
XP_Bool inDupeMode = inDuplicateMode(server); XP_Bool inDupeMode = inDuplicateMode(server);
XP_ASSERT( server->nv.currentTurn == player || inDupeMode ); XP_ASSERT( server->nv.currentTurn == player || inDupeMode );
XP_S16 turn = player; XP_S16 turn = player;
@ -3505,7 +3503,9 @@ commitMoveImpl( ServerCtxt* server, XP_U16 player, TrayTileSet* newTilesP,
} }
#ifdef DEBUG #ifdef DEBUG
CurGameInfo* gi = server->vol.gi;
if ( LP_IS_ROBOT( &gi->players[turn] ) ) { if ( LP_IS_ROBOT( &gi->players[turn] ) ) {
ModelCtxt* model = server->vol.model;
XP_ASSERT( model_checkMoveLegal( model, turn, (XWStreamCtxt*)NULL, XP_ASSERT( model_checkMoveLegal( model, turn, (XWStreamCtxt*)NULL,
(WordNotifierInfo*)NULL ) ); (WordNotifierInfo*)NULL ) );
} }