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

don't show current players tiles in list of remaining

Browse source
This commit is contained in:
Eric House 2018-01-18 22:02:06 -08:00
parent 5afd8763b4
commit 19a6672785
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -781,7 +781,7 @@
</plurals> </plurals>
<!-- Intro to the paragraph listing all of the tiles remaining --> <!-- Intro to the paragraph listing all of the tiles remaining -->
<plurals name="strd_remains_expl_fmt"> <plurals name="strd_remains_expl_fmt">
<item quantity="other">%1$d tiles left in pool and all <item quantity="other">%1$d tiles left in pool and hidden
trays:\n</item> trays:\n</item>
</plurals> </plurals>

4
xwords4/common/server.c
View file

@ -3078,7 +3078,7 @@ server_formatDictCounts( ServerCtxt* server, XWStreamCtxt* stream,
*/ */
void void
server_formatRemainingTiles( ServerCtxt* server, XWStreamCtxt* stream, server_formatRemainingTiles( ServerCtxt* server, XWStreamCtxt* stream,
XP_S16 XP_UNUSED(player) ) XP_S16 player )
{ {
PoolContext* pool = server->pool; PoolContext* pool = server->pool;
if ( !!pool ) { if ( !!pool ) {
@ -3101,7 +3101,7 @@ server_formatRemainingTiles( ServerCtxt* server, XWStreamCtxt* stream,
stream_catString( stream, "\n\n" ); stream_catString( stream, "\n\n" );
XP_MEMSET( counts, 0, sizeof(counts) ); 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; for ( cntsBuf[0] = '\0', offset = 0, tile = 0;
offset < sizeof(cntsBuf); ) { offset < sizeof(cntsBuf); ) {

2
xwords4/linux/linuxutl.c
View file

@ -332,7 +332,7 @@ linux_util_getUserString( XW_UtilCtxt* XP_UNUSED(uc), XP_U16 code )
case STRD_REMAINS_HEADER: case STRD_REMAINS_HEADER:
return (XP_UCHAR*)"%d tiles left in pool."; return (XP_UCHAR*)"%d tiles left in pool.";
case STRD_REMAINS_EXPL: 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: case STRSD_RESIGNED:
return "[Resigned] %s: %d"; return "[Resigned] %s: %d";