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

robot move/trade report dialogs need to block in case the next player

Browse source 
is also a robot
This commit is contained in:
eehouse 2010-05-27 02:58:42 +00:00
parent c5a0384d79
commit b54ffe2b7d
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,9 +52,10 @@ public class BoardActivity extends Activity implements UtilCtxt {
private static final int DLG_OKONLY = Utils.DIALOG_LAST + 1; private static final int DLG_OKONLY = Utils.DIALOG_LAST + 1;
private static final int DLG_BADWORDS = Utils.DIALOG_LAST + 2; private static final int DLG_BADWORDS = Utils.DIALOG_LAST + 2;
private static final int QUERY_REQUEST_BLK = Utils.DIALOG_LAST + 3; private static final int QUERY_REQUEST_BLK = Utils.DIALOG_LAST + 3;
private static final int PICK_TILE_REQUEST_BLK = Utils.DIALOG_LAST + 4; private static final int QUERY_INFORM_BLK = Utils.DIALOG_LAST + 4;
private static final int QUERY_ENDGAME = Utils.DIALOG_LAST + 5; private static final int PICK_TILE_REQUEST_BLK = Utils.DIALOG_LAST + 5;
private static final int ASK_PASSWORD_BLK = Utils.DIALOG_LAST + 6; private static final int QUERY_ENDGAME = Utils.DIALOG_LAST + 6;
private static final int ASK_PASSWORD_BLK = Utils.DIALOG_LAST + 7;
private BoardView m_view; private BoardView m_view;
private int m_jniGamePtr; private int m_jniGamePtr;
@ -123,6 +124,7 @@ public class BoardActivity extends Activity implements UtilCtxt {
break; break;
case QUERY_REQUEST_BLK: case QUERY_REQUEST_BLK:
case QUERY_INFORM_BLK:
ab = new AlertDialog.Builder( this ) ab = new AlertDialog.Builder( this )
.setTitle( R.string.query_title ) .setTitle( R.string.query_title )
.setMessage( m_dlgBytes ); .setMessage( m_dlgBytes );
@ -139,7 +141,9 @@ public class BoardActivity extends Activity implements UtilCtxt {
m_resultCode = 0; m_resultCode = 0;
} }
}; };
if ( QUERY_INFORM_BLK != id ) {
ab.setNegativeButton( R.string.button_no, lstnr ); ab.setNegativeButton( R.string.button_no, lstnr );
}
dialog = ab.create(); dialog = ab.create();
dialog.setOnDismissListener( makeODLforBlocking() ); dialog.setOnDismissListener( makeODLforBlocking() );
@ -212,6 +216,7 @@ public class BoardActivity extends Activity implements UtilCtxt {
// FALLTHRU // FALLTHRU
case DLG_BADWORDS: case DLG_BADWORDS:
case QUERY_REQUEST_BLK: case QUERY_REQUEST_BLK:
case QUERY_INFORM_BLK:
((AlertDialog)dialog).setMessage( m_dlgBytes ); ((AlertDialog)dialog).setMessage( m_dlgBytes );
break; break;
case ASK_PASSWORD_BLK: case ASK_PASSWORD_BLK:
@ -825,10 +830,14 @@ public class BoardActivity extends Activity implements UtilCtxt {
boolean result; boolean result;
switch( id ) { switch( id ) {
// these two are not blocking; post showDialog and move on // Though robot-move dialogs don't normally need to block,
// if the player after this one is also a robot and we
// don't block then a second dialog will replace this one.
// So block. Yuck.
case UtilCtxt.QUERY_ROBOT_MOVE: case UtilCtxt.QUERY_ROBOT_MOVE:
case UtilCtxt.QUERY_ROBOT_TRADE: case UtilCtxt.QUERY_ROBOT_TRADE:
nonBlockingDialog( DLG_OKONLY, query ); m_dlgBytes = query;
waitBlockingDialog( QUERY_INFORM_BLK );
result = true; result = true;
break; break;