mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-27 07:58:49 +01:00
Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy
This commit is contained in:
commit
3ffc93a637
2 changed files with 2 additions and 4 deletions
|
@ -439,9 +439,8 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
|
|||
}
|
||||
|
||||
gi->gameID = stream_getU16( stream );
|
||||
if ( strVersion >= STREAM_VERS_DICTLANG ) {
|
||||
gi->dictLang = stream_getU8( stream );
|
||||
}
|
||||
gi->dictLang =
|
||||
strVersion >= STREAM_VERS_DICTLANG ? stream_getU8( stream ) : 0;
|
||||
if ( gi->timerEnabled || strVersion >= STREAM_VERS_GAMESECONDS ) {
|
||||
gi->gameSeconds = stream_getU16( stream );
|
||||
}
|
||||
|
|
|
@ -488,7 +488,6 @@ undoFromMoveInfo( ModelCtxt* model, XP_U16 turn, Tile blankTile, MoveInfo* mi )
|
|||
}
|
||||
model_addPlayerTile( model, turn, -1, tile );
|
||||
}
|
||||
XP_LOGF( "%s: %d tiles on board", __func__, model->vol.nTilesOnBoard );
|
||||
adjustScoreForUndone( model, mi, turn );
|
||||
} /* undoFromMoveInfo */
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue