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

add turn as param to util_turnChanged, and call from server rather

Browse source 
than board.
This commit is contained in:
Eric House 2012-09-27 07:04:57 -07:00
parent 94103a4212
commit 2c89f13383
8 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,10 +235,10 @@ and_util_yOffsetChange(XW_UtilCtxt* uc, XP_U16 maxOffset,
#ifdef XWFEATURE_TURNCHANGENOTIFY #ifdef XWFEATURE_TURNCHANGENOTIFY
static void static void
and_util_turnChanged(XW_UtilCtxt* uc) and_util_turnChanged( XW_UtilCtxt* uc, XP_S16 turn )
{ {
UTIL_CBK_HEADER( "turnChanged", "()V" ); UTIL_CBK_HEADER( "turnChanged", "(I)V" );
(*env)->CallVoidMethod( env, util->jutil, mid ); (*env)->CallVoidMethod( env, util->jutil, mid, turn );
UTIL_CBK_TAIL(); UTIL_CBK_TAIL();
} }
#endif #endif

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

@ -1306,8 +1306,10 @@ public class BoardActivity extends XWActivity
} }
@Override @Override
public void turnChanged() public void turnChanged( int newTurn )
{ {
DbgUtils.logf( "turnChanged(%d)", newTurn );
if ( 0 <= newTurn ) {
post( new Runnable() { post( new Runnable() {
public void run() { public void run() {
showNotAgainDlgThen( R.string.not_again_turnchanged, showNotAgainDlgThen( R.string.not_again_turnchanged,
@ -1316,6 +1318,7 @@ public class BoardActivity extends XWActivity
} ); } );
m_jniThread.handle( JNIThread.JNICmd. CMD_ZOOM, -8 ); m_jniThread.handle( JNIThread.JNICmd. CMD_ZOOM, -8 );
} }
}
@Override @Override
public boolean engineProgressCallback() public boolean engineProgressCallback()

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

@ -680,7 +680,7 @@ public class GameUtils {
DBUtils.appendChatHistory( m_context, m_rowid, msg, false ); DBUtils.appendChatHistory( m_context, m_rowid, msg, false );
m_gotChat = true; m_gotChat = true;
} }
public void turnChanged() public void turnChanged( int newTurn )
{ {
m_gotMsg = true; m_gotMsg = true;
} }

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

@ -40,7 +40,7 @@ public interface UtilCtxt {
String[] curTiles, int nPicked ); String[] curTiles, int nPicked );
String askPassword( String name ); String askPassword( String name );
void turnChanged(); void turnChanged( int newTurn );
boolean engineProgressCallback(); boolean engineProgressCallback();

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

@ -62,7 +62,7 @@ public class UtilCtxtImpl implements UtilCtxt {
return null; return null;
} }
public void turnChanged() public void turnChanged( int newTurn )
{ {
subclassOverride( "turnChanged" ); subclassOverride( "turnChanged" );
} }

3
xwords4/common/board.c
View file

@ -165,7 +165,6 @@ board_make( MPFORMAL ModelCtxt* model, ServerCtxt* server, DrawCtx* draw,
result->star_row = (XP_U16)(model_numRows(model) / 2); result->star_row = (XP_U16)(model_numRows(model) / 2);
/* could just pass in invalCell.... PENDING(eeh) */
model_setBoardListener( model, boardCellChanged, result ); model_setBoardListener( model, boardCellChanged, result );
model_setTrayListener( model, boardTilesChanged, result ); model_setTrayListener( model, boardTilesChanged, result );
model_setDictListener( model, dictChanged, result ); model_setDictListener( model, dictChanged, result );
@ -3465,8 +3464,6 @@ boardTurnChanged( void* p_board )
setTimerIf( board ); setTimerIf( board );
board->scoreBoardInvalid = XP_TRUE; board->scoreBoardInvalid = XP_TRUE;
util_turnChanged( board->util );
} /* boardTurnChanged */ } /* boardTurnChanged */
static void static void

1
xwords4/common/server.c
View file

@ -1858,6 +1858,7 @@ nextTurn( ServerCtxt* server, XP_S16 nxtTurn )
XP_ASSERT( server->nv.gameState != XWSTATE_GAMEOVER ); XP_ASSERT( server->nv.gameState != XWSTATE_GAMEOVER );
callTurnChangeListener( server ); callTurnChangeListener( server );
util_turnChanged( server->vol.util, server->nv.currentTurn );
if ( robotMovePending(server) && !POSTPONEROBOTMOVE(server) ) { if ( robotMovePending(server) && !POSTPONEROBOTMOVE(server) ) {
moreToDo = XP_TRUE; moreToDo = XP_TRUE;

8
xwords4/common/util.h
View file

@ -125,7 +125,7 @@ typedef struct UtilVtable {
void (*m_util_yOffsetChange)(XW_UtilCtxt* uc, XP_U16 maxOffset, void (*m_util_yOffsetChange)(XW_UtilCtxt* uc, XP_U16 maxOffset,
XP_U16 oldOffset, XP_U16 newOffset ); XP_U16 oldOffset, XP_U16 newOffset );
#ifdef XWFEATURE_TURNCHANGENOTIFY #ifdef XWFEATURE_TURNCHANGENOTIFY
void (*m_util_turnChanged)(XW_UtilCtxt* uc); void (*m_util_turnChanged)(XW_UtilCtxt* uc, XP_S16 newTurn);
#endif #endif
void (*m_util_informMove)( XW_UtilCtxt* uc, XWStreamCtxt* expl, void (*m_util_informMove)( XW_UtilCtxt* uc, XWStreamCtxt* expl,
XWStreamCtxt* words ); XWStreamCtxt* words );
@ -240,10 +240,10 @@ struct XW_UtilCtxt {
(uc)->vtable->m_util_yOffsetChange((uc), (m), (o), (n) ) (uc)->vtable->m_util_yOffsetChange((uc), (m), (o), (n) )
#ifdef XWFEATURE_TURNCHANGENOTIFY #ifdef XWFEATURE_TURNCHANGENOTIFY
# define util_turnChanged( uc ) \ # define util_turnChanged( uc, t ) \
(uc)->vtable->m_util_turnChanged((uc) ) (uc)->vtable->m_util_turnChanged( (uc), (t) )
#else #else
# define util_turnChanged( uc ) # define util_turnChanged( uc, t )
#endif #endif
#define util_informMove(uc,e,w) \ #define util_informMove(uc,e,w) \