Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

in model_getWordsPlayed, make '\n' a separator rather than a

Browse source 
terminator.  Makes it easier to split in the Java world without
getting an extra empty word.
This commit is contained in:
Andy2 2011-09-18 19:05:00 -07:00
parent 9eacdb3856
commit 26ce5a119a
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xwords4/common/model.c
View file

@ -2033,14 +2033,22 @@ model_recentPassCountOk( ModelCtxt* model )
return count < okCount;
}
typedef struct _RecordWordsInfo {
XWStreamCtxt* stream;
XP_U16 nWords;
} RecordWordsInfo;
static XP_Bool
recordWord( const XP_UCHAR* word, XP_Bool isLegal, void* closure )
{
XWStreamCtxt* stream = (XWStreamCtxt*)closure;
RecordWordsInfo* info = (RecordWordsInfo*)closure;
XWStreamCtxt* stream = info->stream;
XP_ASSERT( isLegal );
XP_LOGF( "%s(%s)", __func__, word );
if ( 0 < info->nWords++ ) {
stream_putU8( stream, '\n' );
}
stream_catString( stream, word );
stream_putU8( stream, '\n' );
return XP_TRUE;
}
@ -2060,8 +2068,9 @@ model_getWordsPlayed( ModelCtxt* model, PoolContext* pool,
}
if ( model_undoLatestMoves( model, pool, nTurns, NULL, NULL ) ) {
RecordWordsInfo info = { .stream = stream, .nWords = 0 };
WordNotifierInfo notifyInfo = { .proc = recordWord,
.closure = stream,
.closure = &info,
};
/* Now push the undone moves back into the model one at a time.