Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove second param from server_do() -- it doesn't work anyway.

Browse source
This commit is contained in:
Andy2 2011-12-21 18:45:05 -08:00
parent cb04eb8840
commit 2a34cd1e05
6 changed files with 20 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -798,7 +798,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1do
{ {
jboolean result; jboolean result;
XWJNI_START(); XWJNI_START();
result = server_do( state->game.server, NULL ); result = server_do( state->game.server );
XWJNI_END(); XWJNI_END();
return result; return result;
} }
@ -1043,7 +1043,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1receiveMessage
/* XP_Bool notDone; */ /* XP_Bool notDone; */
/* in case work's pending */ /* in case work's pending */
/* for ( notDone = XP_TRUE; notDone; ) { */ /* for ( notDone = XP_TRUE; notDone; ) { */
(void)server_do( server, NULL ); (void)server_do( server );
/* } */ /* } */
(void)server_receiveMessage( server, stream ); (void)server_receiveMessage( server, stream );
/* in case MORE work's pending. Multiple calls are required in at /* in case MORE work's pending. Multiple calls are required in at
@ -1052,9 +1052,8 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1receiveMessage
robot move. That's because comms can't detect a duplicate initial robot move. That's because comms can't detect a duplicate initial
packet (in validateInitialMessage()). */ packet (in validateInitialMessage()). */
int ii; int ii;
XP_Bool notDone; for ( ii = 0; ii < 5; ++ii ) {
for ( ii = 0, notDone = XP_TRUE; notDone && ii < 5; ++ii ) { (void)server_do( server );
(void)server_do( server, &notDone );
} }
} }

6
xwords4/common/server.c
View file

@ -964,7 +964,7 @@ showPrevScore( ServerCtxt* server )
} /* showPrevScore */ } /* showPrevScore */
XP_Bool XP_Bool
server_do( ServerCtxt* server, XP_Bool* moreToDoP ) server_do( ServerCtxt* server )
{ {
XP_Bool result = XP_TRUE; XP_Bool result = XP_TRUE;
@ -1038,9 +1038,7 @@ server_do( ServerCtxt* server, XP_Bool* moreToDoP )
break; break;
} /* switch */ } /* switch */
if ( NULL != moreToDoP ) { if ( moreToDo ) {
*moreToDoP = moreToDo;
} else if ( moreToDo ) {
util_requestTime( server->vol.util ); util_requestTime( server->vol.util );
} }

2
xwords4/common/server.h
View file

@ -98,7 +98,7 @@ XP_U16 server_getMissingPlayers( const ServerCtxt* server );
/* Signed in case no dictionary available */ /* Signed in case no dictionary available */
XP_S16 server_countTilesInPool( ServerCtxt* server ); XP_S16 server_countTilesInPool( ServerCtxt* server );
XP_Bool server_do( ServerCtxt* server, XP_Bool* moreToDoP ); XP_Bool server_do( ServerCtxt* server );
XP_Bool server_commitMove( ServerCtxt* server ); XP_Bool server_commitMove( ServerCtxt* server );
XP_Bool server_commitTrade( ServerCtxt* server, const TrayTileSet* oldTiles ); XP_Bool server_commitTrade( ServerCtxt* server, const TrayTileSet* oldTiles );

4
xwords4/linux/cursesmain.c
View file

@ -450,7 +450,7 @@ static gboolean
onetime_idle( gpointer data ) onetime_idle( gpointer data )
{ {
CursesAppGlobals* globals = (CursesAppGlobals*)data; CursesAppGlobals* globals = (CursesAppGlobals*)data;
if ( server_do( globals->cGlobals.game.server, NULL ) ) { if ( server_do( globals->cGlobals.game.server ) ) {
if ( !!globals->cGlobals.game.board ) { if ( !!globals->cGlobals.game.board ) {
board_draw( globals->cGlobals.game.board ); board_draw( globals->cGlobals.game.board );
} }
@ -1841,7 +1841,7 @@ cursesmain( XP_Bool isServer, LaunchParams* params )
} }
#endif #endif
server_do( g_globals.cGlobals.game.server, NULL ); server_do( g_globals.cGlobals.game.server );
g_globals.menuList = g_boardMenuList; g_globals.menuList = g_boardMenuList;
drawMenuLargeOrSmall( &g_globals, g_boardMenuList ); drawMenuLargeOrSmall( &g_globals, g_boardMenuList );

10
xwords4/linux/gtkmain.c
View file

@ -511,7 +511,7 @@ createOrLoadObjects( GtkAppGlobals* globals )
comms_start( globals->cGlobals.game.comms ); comms_start( globals->cGlobals.game.comms );
} }
#endif #endif
server_do( globals->cGlobals.game.server, NULL ); server_do( globals->cGlobals.game.server );
disenable_buttons( globals ); disenable_buttons( globals );
} /* createOrLoadObjects */ } /* createOrLoadObjects */
@ -823,7 +823,7 @@ new_game_impl( GtkAppGlobals* globals, XP_Bool fireConnDlg )
stream ); stream );
} }
#endif #endif
(void)server_do( globals->cGlobals.game.server, NULL ); /* assign tiles, etc. */ (void)server_do( globals->cGlobals.game.server ); /* assign tiles, etc. */
board_invalAll( globals->cGlobals.game.board ); board_invalAll( globals->cGlobals.game.board );
board_draw( globals->cGlobals.game.board ); board_draw( globals->cGlobals.game.board );
} }
@ -845,7 +845,7 @@ game_info( GtkWidget* XP_UNUSED(widget), GtkAppGlobals* globals )
/* Anything to do if OK is clicked? Changed names etc. already saved. Try /* Anything to do if OK is clicked? Changed names etc. already saved. Try
server_do in case one's become a robot. */ server_do in case one's become a robot. */
if ( newGameDialog( globals, &addr, XP_FALSE, XP_FALSE ) ) { if ( newGameDialog( globals, &addr, XP_FALSE, XP_FALSE ) ) {
if ( server_do( globals->cGlobals.game.server, NULL ) ) { if ( server_do( globals->cGlobals.game.server ) ) {
board_draw( globals->cGlobals.game.board ); board_draw( globals->cGlobals.game.board );
} }
} }
@ -1603,7 +1603,7 @@ idle_func( gpointer data )
and bad things can happen. So kill the idle proc asap. */ and bad things can happen. So kill the idle proc asap. */
gtk_idle_remove( globals->idleID ); gtk_idle_remove( globals->idleID );
if ( server_do( globals->cGlobals.game.server, NULL ) ) { if ( server_do( globals->cGlobals.game.server ) ) {
if ( !!globals->cGlobals.game.board ) { if ( !!globals->cGlobals.game.board ) {
board_draw( globals->cGlobals.game.board ); board_draw( globals->cGlobals.game.board );
} }
@ -2059,7 +2059,7 @@ newConnectionInput( GIOChannel *source,
if ( redraw ) { if ( redraw ) {
gtk_util_requestTime( globals->cGlobals.params->util ); gtk_util_requestTime( globals->cGlobals.params->util );
} else { } else {
redraw = server_do( globals->cGlobals.game.server, NULL ); redraw = server_do( globals->cGlobals.game.server );
} }
if ( redraw ) { if ( redraw ) {
board_draw( globals->cGlobals.game.board ); board_draw( globals->cGlobals.game.board );

14
xwords4/linux/linuxmain.c
View file

@ -240,13 +240,12 @@ handle_messages_from( CommonGlobals* cGlobals, const TransportProcs* procs,
if ( comms_checkIncomingStream( cGlobals->game.comms, if ( comms_checkIncomingStream( cGlobals->game.comms,
stream, NULL ) ) { stream, NULL ) ) {
ServerCtxt* server = cGlobals->game.server; ServerCtxt* server = cGlobals->game.server;
(void)server_do( server, NULL ); (void)server_do( server );
handled = server_receiveMessage( server, stream ) || handled; handled = server_receiveMessage( server, stream ) || handled;
XP_Bool notDone;
XP_U16 ii; XP_U16 ii;
for ( ii = 0, notDone = XP_TRUE; notDone && ii < 5; ++ii ) { for ( ii = 0; ii < 5; ++ii ) {
(void)server_do( server, &notDone ); (void)server_do( server );
} }
} }
stream_destroy( stream ); stream_destroy( stream );
@ -305,13 +304,12 @@ read_pipe_then_close( CommonGlobals* cGlobals, const TransportProcs* procs )
if ( comms_checkIncomingStream( cGlobals->game.comms, if ( comms_checkIncomingStream( cGlobals->game.comms,
stream, NULL ) ) { stream, NULL ) ) {
ServerCtxt* server = cGlobals->game.server; ServerCtxt* server = cGlobals->game.server;
(void)server_do( server, NULL ); (void)server_do( server );
handled = server_receiveMessage( server, stream ) || handled; handled = server_receiveMessage( server, stream ) || handled;
XP_Bool notDone;
XP_U16 ii; XP_U16 ii;
for ( ii = 0, notDone = XP_TRUE; notDone && ii < 5; ++ii ) { for ( ii = 0; ii < 5; ++ii ) {
(void)server_do( server, &notDone ); (void)server_do( server );
} }
} }
stream_destroy( stream ); stream_destroy( stream );