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

don't exit trade mode if no tiles selected; fix warning string to match.

Browse source
This commit is contained in:
Andy2 2011-09-09 18:40:19 -07:00
parent 201db9415c
commit 66fb5f87fb
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/res/values/strings.xml
View file

@ -135,8 +135,8 @@
<string name="str_tiles_must_contact">New pieces must contact others already in place (or the middle square on the first move)</string>
<string name="str_not_your_turn">You can\'t do that; it\'s not your turn!</string>
<string name="str_no_peek_robot_tiles">No peeking at the robot\'s tiles!</string>
<string name="str_no_empty_trade">Trade cancelled because no tiles
selected. (It\'s still your turn.)</string>
<string name="str_no_empty_trade">Please tap to select tiles to be
exchanged.</string>
<string name="str_too_few_tiles_left_to_trade">Too few tiles left to exchange.</string>
<string name="str_cant_undo_tileassign">Tile assignment can\'t be undone.</string>
<string name="str_cant_hint_while_disabled">The hint feature is disabled for this game. Enable it for a new game using the Settings dialog.</string>

10
xwords4/common/board.c
View file

@ -763,13 +763,15 @@ board_commitTurn( BoardCtxt* board )
after */
/* server_commitTrade() changes selPlayer, so board_endTrade
must be called first() */
(void)board_endTrade( board );
if ( NO_TILES == traySelBits ) {
util_userError( board->util, ERR_NO_EMPTY_TRADE );
} else if ( util_userQuery( board->util, QUERY_COMMIT_TRADE,
(XWStreamCtxt*)NULL ) ) {
(void)server_commitTrade( board->server, traySelBits );
} else {
(void)board_endTrade( board );
if ( util_userQuery( board->util, QUERY_COMMIT_TRADE,
(XWStreamCtxt*)NULL ) ) {
(void)server_commitTrade( board->server, traySelBits );
}
}
} else {
XP_Bool warn, legal;