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

cleanup

Browse source
This commit is contained in:
Eric House 2021-03-22 10:43:23 -07:00
parent bdb081d0e3
commit 561c5c9eb1
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameOverAlert.java
View file

@ -121,7 +121,6 @@ public class GameOverAlert extends XWDialogFragment
} }
}); });
Log.d( TAG, "onCreateDialog() => %s", mDialog );
return mDialog; return mDialog;
} }

1
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
View file

@ -686,7 +686,6 @@ public class Utils {
return result; return result;
} }
static void enableAlertButton( AlertDialog dlg, int which, boolean enable ) static void enableAlertButton( AlertDialog dlg, int which, boolean enable )
{ {
Button button = dlg.getButton(which); Button button = dlg.getButton(which);

2
xwords4/common/dictnry.c
View file

@ -768,6 +768,7 @@ common_destructor( DictionaryCtxt* dict, XWEnv XP_UNUSED(xwe) )
XP_FREE( dict->mpool, dict ); XP_FREE( dict->mpool, dict );
} /* common_destructor */ } /* common_destructor */
#ifndef XWFEATURE_STANDALONE_ONLY
void void
dict_loadFromStream( DictionaryCtxt* dict, XWEnv xwe, XWStreamCtxt* stream ) dict_loadFromStream( DictionaryCtxt* dict, XWEnv xwe, XWStreamCtxt* stream )
{ {
@ -828,6 +829,7 @@ dict_loadFromStream( DictionaryCtxt* dict, XWEnv xwe, XWStreamCtxt* stream )
} }
setBlankTile( dict ); setBlankTile( dict );
} /* dict_loadFromStream */ } /* dict_loadFromStream */
#endif
#ifdef TEXT_MODEL #ifdef TEXT_MODEL
/* Return the strlen of the longest face, e.g. 1 for English and Italian; /* Return the strlen of the longest face, e.g. 1 for English and Italian;

6
xwords4/common/server.c
View file

@ -1937,15 +1937,11 @@ client_readInitialMessage( ServerCtxt* server, XWEnv xwe, XWStreamCtxt* stream )
XP_U16 nCols = localGI.boardSize; XP_U16 nCols = localGI.boardSize;
XP_LOGFF( "streamVersion: %d; STREAM_VERS_NOEMPTYDICT: %d",
streamVersion, STREAM_VERS_NOEMPTYDICT );
if ( streamVersion < STREAM_VERS_NOEMPTYDICT ) { if ( streamVersion < STREAM_VERS_NOEMPTYDICT ) {
XP_LOGFF( "loading and dropping empty dict" ); XP_LOGFF( "loading and dropping empty dict" );
DictionaryCtxt* empty = util_makeEmptyDict( server->vol.util, xwe ); DictionaryCtxt* empty = util_makeEmptyDict( server->vol.util, xwe );
dict_loadFromStream( empty, xwe, stream ); dict_loadFromStream( empty, xwe, stream );
dict_unref( empty, xwe ); dict_unref( empty, xwe );
} else {
XP_LOGFF( "NO empty dict bytes to skip" );
} }
#ifdef STREAM_VERS_BIGBOARD #ifdef STREAM_VERS_BIGBOARD
@ -2105,8 +2101,6 @@ sendInitialMessage( ServerCtxt* server, XWEnv xwe )
if ( streamVersion < STREAM_VERS_NOEMPTYDICT ) { if ( streamVersion < STREAM_VERS_NOEMPTYDICT ) {
XP_LOGFF( "writing dict to stream" ); XP_LOGFF( "writing dict to stream" );
dict_writeToStream( dict, stream ); dict_writeToStream( dict, stream );
} else {
XP_LOGFF( "SKIPPING write of dict to stream" );
} }
#ifdef STREAM_VERS_BIGBOARD #ifdef STREAM_VERS_BIGBOARD
if ( STREAM_VERS_DICTNAME <= streamVersion ) { if ( STREAM_VERS_DICTNAME <= streamVersion ) {