diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index f6616d84e..e12a2b97b 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -781,7 +781,7 @@ - %1$d tiles left in pool and all + %1$d tiles left in pool and hidden trays:\n diff --git a/xwords4/common/server.c b/xwords4/common/server.c index 7a287d067..ba7abe933 100644 --- a/xwords4/common/server.c +++ b/xwords4/common/server.c @@ -3078,7 +3078,7 @@ server_formatDictCounts( ServerCtxt* server, XWStreamCtxt* stream, */ void server_formatRemainingTiles( ServerCtxt* server, XWStreamCtxt* stream, - XP_S16 XP_UNUSED(player) ) + XP_S16 player ) { PoolContext* pool = server->pool; if ( !!pool ) { @@ -3101,7 +3101,7 @@ server_formatRemainingTiles( ServerCtxt* server, XWStreamCtxt* stream, stream_catString( stream, "\n\n" ); XP_MEMSET( counts, 0, sizeof(counts) ); - model_countAllTrayTiles( server->vol.model, counts, -1 ); + model_countAllTrayTiles( server->vol.model, counts, player ); for ( cntsBuf[0] = '\0', offset = 0, tile = 0; offset < sizeof(cntsBuf); ) { diff --git a/xwords4/linux/linuxutl.c b/xwords4/linux/linuxutl.c index fbab06504..b596f9cdf 100644 --- a/xwords4/linux/linuxutl.c +++ b/xwords4/linux/linuxutl.c @@ -332,7 +332,7 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code ) case STRD_REMAINS_HEADER: return (XP_UCHAR*)"%d tiles left in pool."; case STRD_REMAINS_EXPL: - return (XP_UCHAR*)"%d tiles left in pool and all tray[s]:\n"; + return (XP_UCHAR*)"%d tiles left in pool and hidden trays:\n"; case STRSD_RESIGNED: return "[Resigned] %s: %d";