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

Support new error message about exchange being disallowed when no selection.

Browse source
This commit is contained in:
Andy2 2011-03-07 06:40:11 -08:00
parent 54f2ae3edf
commit 8c40628916
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,8 @@
<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_cant_trade_mid_move">Remove played tiles before exchanging.</string>
<string name="str_no_empty_trade">Trade cancelled because no tiles
selected. (It\'s still your turn.)</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>

3
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
View file

@ -970,6 +970,9 @@ public class BoardActivity extends XWActivity
case UtilCtxt.ERR_CANT_TRADE_MID_MOVE:
resid = R.string.str_cant_trade_mid_move;
break;
case UtilCtxt.ERR_NO_EMPTY_TRADE:
resid = R.string.str_no_empty_trade;
break;
case UtilCtxt.ERR_TOO_FEW_TILES_LEFT_TO_TRADE:
resid = R.string.str_too_few_tiles_left_to_trade;
break;

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/UtilCtxt.java
View file

@ -97,9 +97,10 @@ public interface UtilCtxt {
static final int ERR_REG_SERVER_SANS_REMOTE = 11;
static final int STR_NEED_BT_HOST_ADDR = 12;
static final int ERR_CANT_TRADE_MID_MOVE = 13;
static final int ERR_CANT_UNDO_TILEASSIGN = 14;
static final int ERR_CANT_HINT_WHILE_DISABLED = 15;
static final int ERR_RELAY_BASE = 16;
static final int ERR_NO_EMPTY_TRADE = 14;
static final int ERR_CANT_UNDO_TILEASSIGN = 15;
static final int ERR_CANT_HINT_WHILE_DISABLED = 16;
static final int ERR_RELAY_BASE = 17;
void userError( int id );
void notifyGameOver();