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

clear pending move before applying phonies rejection

Browse source 
If slow network traffic has given a guest time to move tiles to the
board while the host decides its last move must be rejected, those tiles
must be removed before the rejected turn can be undone.
This commit is contained in:
Eric House 2020-04-21 22:28:20 -07:00
parent 9d04b97ec8
commit 0dc39b5d85
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/common/model.c
View file

@ -902,6 +902,8 @@ model_rejectPreviousMove( ModelCtxt* model, PoolContext* pool, XP_U16* turn )
stack_popEntry( stack, &entry ); stack_popEntry( stack, &entry );
XP_ASSERT( entry.moveType == MOVE_TYPE ); XP_ASSERT( entry.moveType == MOVE_TYPE );
model_resetCurrentTurn( model, entry.playerNum );
replaceNewTiles( model, pool, entry.playerNum, &entry.u.move.newTiles ); replaceNewTiles( model, pool, entry.playerNum, &entry.u.move.newTiles );
XP_ASSERT( !model->vol.gi->inDuplicateMode ); XP_ASSERT( !model->vol.gi->inDuplicateMode );
undoFromMove( model, entry.playerNum, blankTile, &entry.u.move ); undoFromMove( model, entry.playerNum, blankTile, &entry.u.move );