Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy

Browse source
This commit is contained in:
eehouse@eehouse.org 2010-10-27 05:51:54 -07:00 • committed by Andy2
commit 3ffc93a637
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
xwords4/common/game.c
View file

@ -439,9 +439,8 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
} }
gi->gameID = stream_getU16( stream ); gi->gameID = stream_getU16( stream );
if ( strVersion >= STREAM_VERS_DICTLANG ) { gi->dictLang =
gi->dictLang = stream_getU8( stream ); strVersion >= STREAM_VERS_DICTLANG ? stream_getU8( stream ) : 0;
}
if ( gi->timerEnabled || strVersion >= STREAM_VERS_GAMESECONDS ) { if ( gi->timerEnabled || strVersion >= STREAM_VERS_GAMESECONDS ) {
gi->gameSeconds = stream_getU16( stream ); gi->gameSeconds = stream_getU16( stream );
} }

1
xwords4/common/model.c
View file

@ -488,7 +488,6 @@ undoFromMoveInfo( ModelCtxt* model, XP_U16 turn, Tile blankTile, MoveInfo* mi )
} }
model_addPlayerTile( model, turn, -1, tile ); model_addPlayerTile( model, turn, -1, tile );
} }
XP_LOGF( "%s: %d tiles on board", __func__, model->vol.nTilesOnBoard );
adjustScoreForUndone( model, mi, turn ); adjustScoreForUndone( model, mi, turn );
} /* undoFromMoveInfo */ } /* undoFromMoveInfo */