Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix missing import (oops) and cleanup final scores stuff.

Browse source
This commit is contained in:
eehouse 2010-02-27 18:03:36 +00:00
parent 6d1c09e756
commit 28edaa09e2
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -708,8 +708,7 @@ public class BoardActivity extends Activity implements UtilCtxt {
public void notifyGameOver() public void notifyGameOver()
{ {
m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER, m_jniThread.handle( JNIThread.JNICmd.CMD_POST_OVER );
R.string.finalscores_title );
} }
public boolean warnIllegalWord( String[] words, int turn, boolean turnLost ) public boolean warnIllegalWord( String[] words, int turn, boolean turnLost )

9
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
View file

@ -12,6 +12,7 @@ import android.os.Message;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Rect; import android.graphics.Rect;
import org.eehouse.android.xw4.R;
import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole; import org.eehouse.android.xw4.jni.CurGameInfo.DeviceRole;
public class JNIThread extends Thread { public class JNIThread extends Thread {
@ -302,14 +303,12 @@ public class JNIThread extends Thread {
boolean gameOver = XwJNI.server_getGameIsOver( m_jniGamePtr ); boolean gameOver = XwJNI.server_getGameIsOver( m_jniGamePtr );
sendForDialog( ((Integer)args[0]).intValue(), sendForDialog( ((Integer)args[0]).intValue(),
XwJNI.model_writeGameHistory( m_jniGamePtr, XwJNI.model_writeGameHistory( m_jniGamePtr,
gameOver ) gameOver ) );
);
break; break;
case CMD_FINAL: case CMD_FINAL:
if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) { if ( XwJNI.server_getGameIsOver( m_jniGamePtr ) ) {
String msg = XwJNI.server_writeFinalScores( m_jniGamePtr ); handle( JNICmd.CMD_POST_OVER );
sendForDialog( R.string.query_title, msg );
} else { } else {
Message.obtain( m_handler, QUERY_ENDGAME ).sendToTarget(); Message.obtain( m_handler, QUERY_ENDGAME ).sendToTarget();
draw = true; draw = true;
@ -321,7 +320,7 @@ public class JNIThread extends Thread {
break; break;
case CMD_POST_OVER: case CMD_POST_OVER:
sendForDialog( ((Integer)args[0]).intValue(), sendForDialog( R.string.finalscores_title,
XwJNI.server_writeFinalScores( m_jniGamePtr ) ); XwJNI.server_writeFinalScores( m_jniGamePtr ) );
break; break;