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

fix to work with changed C api

Browse source
This commit is contained in:
Andy2 2011-09-22 06:49:34 -07:00
parent 35a0a3a291
commit fcdbed0920
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/jni/xwjni.c
View file

@ -1242,14 +1242,13 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1endGame
} }
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_server_1listWordsPlayed Java_org_eehouse_android_xw4_jni_XwJNI_model_1getWordsPlayed
( JNIEnv* env, jclass C, jint gamePtr, jint nMoves ) ( JNIEnv* env, jclass C, jint gamePtr, jint nMoves )
{ {
jstring result; jstring result;
XWJNI_START_GLOBALS(); XWJNI_START_GLOBALS();
XP_ASSERT( !!state->game.server );
XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals ); XWStreamCtxt* stream = and_empty_stream( MPPARM(mpool) globals );
server_listWordsPlayed( state->game.server, stream, nMoves ); model_getWordsPlayed( state->game.model, nMoves, stream );
result = streamToJString( MPPARM(mpool) env, stream ); result = streamToJString( MPPARM(mpool) env, stream );
(*env)->DeleteLocalRef( env, result ); (*env)->DeleteLocalRef( env, result );
stream_destroy( stream ); stream_destroy( stream );
@ -1257,7 +1256,6 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1listWordsPlayed
return result; return result;
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_eehouse_android_xw4_jni_XwJNI_server_1sendChat Java_org_eehouse_android_xw4_jni_XwJNI_server_1sendChat
( JNIEnv* env, jclass C, jint gamePtr, jstring jmsg ) ( JNIEnv* env, jclass C, jint gamePtr, jstring jmsg )

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

@ -493,7 +493,7 @@ public class JNIThread extends Thread {
break; break;
case CMD_WORDS: case CMD_WORDS:
String words = XwJNI.server_listWordsPlayed( m_jniGamePtr, 1 ); String words = XwJNI.model_getWordsPlayed( m_jniGamePtr, 1 );
Message.obtain( m_handler, GOT_WORDS, words ).sendToTarget(); Message.obtain( m_handler, GOT_WORDS, words ).sendToTarget();
break; break;

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

@ -202,7 +202,10 @@ public class XwJNI {
public static native String model_writeGameHistory( int gamePtr, public static native String model_writeGameHistory( int gamePtr,
boolean gameOver ); boolean gameOver );
public static native int model_getNMoves( int gamePtr ); public static native int model_getNMoves( int gamePtr );
public static native String model_getPlayersLastScore( int gamePtr, int player ); public static native String model_getPlayersLastScore( int gamePtr,
int player );
public static native String model_getWordsPlayed( int gamePtr,
int nTurns );
// Server // Server
public static native void server_reset( int gamePtr ); public static native void server_reset( int gamePtr );
@ -214,8 +217,6 @@ public class XwJNI {
public static native void server_initClientConnection( int gamePtr ); public static native void server_initClientConnection( int gamePtr );
public static native void server_endGame( int gamePtr ); public static native void server_endGame( int gamePtr );
public static native void server_sendChat( int gamePtr, String msg ); public static native void server_sendChat( int gamePtr, String msg );
public static native String server_listWordsPlayed( int gamePtr,
int nMoves );
// hybrid to save work // hybrid to save work
public static native boolean board_server_prefsChanged( int gamePtr, public static native boolean board_server_prefsChanged( int gamePtr,