Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exit trade mode on "commit" even if no tiles selected (in keeping with

Browse source 
error message on Android); don't block trade if pending tiles are on
board; instead undo them. There's redo now so there's no need to
confirm, no data loss.
This commit is contained in:
Andy2 2011-09-02 06:48:06 -07:00
parent dadf41ad2e
commit 99679357a8
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
xwords4/common/board.c
View file

@ -757,18 +757,18 @@ board_commitTurn( BoardCtxt* board )
nothing */ nothing */
} else if ( checkRevealTray( board ) ) { } else if ( checkRevealTray( board ) ) {
if ( pti->tradeInProgress ) { if ( pti->tradeInProgress ) {
TileBit traySelBits = pti->traySelBits;
result = XP_TRUE; /* there's at least the window to clean up result = XP_TRUE; /* there's at least the window to clean up
after */ after */
/* server_commitTrade() changes selPlayer, so board_endTrade
must be called first() */
(void)board_endTrade( board );
if ( NO_TILES == pti->traySelBits ) { if ( NO_TILES == traySelBits ) {
util_userError( board->util, ERR_NO_EMPTY_TRADE ); util_userError( board->util, ERR_NO_EMPTY_TRADE );
} else if ( util_userQuery( board->util, QUERY_COMMIT_TRADE, } else if ( util_userQuery( board->util, QUERY_COMMIT_TRADE,
(XWStreamCtxt*)NULL ) ) { (XWStreamCtxt*)NULL ) ) {
TileBit traySelBits = pti->traySelBits; (void)server_commitTrade( board->server, traySelBits );
/* server_commitTrade() changes selPlayer, so board_endTrade
must be called first() */
(void)board_endTrade( board );
result = server_commitTrade( board->server, traySelBits );
} }
} else { } else {
XP_Bool warn, legal; XP_Bool warn, legal;
@ -2077,13 +2077,12 @@ board_beginTrade( BoardCtxt* board )
result = preflight( board ); result = preflight( board );
if ( result ) { if ( result ) {
/* check turn before tradeInProgress so I can't tell my opponent's in a if ( server_countTilesInPool(board->server) < MIN_TRADE_TILES){
trade */
if ( 0 != model_getCurrentMoveCount( board->model, board->selPlayer )){
util_userError( board->util, ERR_CANT_TRADE_MID_MOVE );
} else if ( server_countTilesInPool(board->server) < MIN_TRADE_TILES){
util_userError( board->util, ERR_TOO_FEW_TILES_LEFT_TO_TRADE ); util_userError( board->util, ERR_TOO_FEW_TILES_LEFT_TO_TRADE );
} else { } else {
model_resetCurrentTurn( board->model, board->selPlayer );
XP_ASSERT( 0 == model_getCurrentMoveCount( board->model,
board->selPlayer ) );
#ifdef XWFEATURE_MINIWIN #ifdef XWFEATURE_MINIWIN
board->tradingMiniWindowInvalid = XP_TRUE; board->tradingMiniWindowInvalid = XP_TRUE;
#endif #endif