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

new API and behavior: if a printer proc's provided all moves are

Browse source 
passed to it whether they're worth saving or not.
This commit is contained in:
Eric House 2011-04-16 22:38:31 -07:00
parent c27538e567
commit 2608787b4e
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
xwords4/common/engine.c
View file

@ -114,6 +114,11 @@ struct EngineCtxt {
#endif
XP_U16 lastRowToFill;
#ifdef TEXT_MODEL
MovePrintFunc printer;
void* printClosure;
#endif
#ifdef DEBUG
XP_U16 curLimit;
#endif
@ -265,6 +270,15 @@ engine_destroy( EngineCtxt* engine )
XP_FREE( engine->mpool, engine );
} /* engine_destroy */
#ifdef TEXT_MODEL
void
engine_setPrinter( EngineCtxt* ctxt, MovePrintFunc proc, void* closure )
{
ctxt->printer = proc;
ctxt->printClosure = closure;
}
#endif
static XP_Bool
initTray( EngineCtxt* engine, const Tile* tiles, XP_U16 numTiles )
{
@ -1117,6 +1131,7 @@ considerScoreWordHasBlanks( EngineCtxt* engine, XP_U16 blanksLeft,
if ( blanksLeft == 0 ) {
XP_U16 score;
XP_Bool qualifies;
score = figureMoveScore( engine->model, engine->turn,
&posmove->moveInfo,
@ -1126,7 +1141,8 @@ considerScoreWordHasBlanks( EngineCtxt* engine, XP_U16 blanksLeft,
/* First, check that the score is even what we're interested in. If
it is, then go to the expense of filling in a PossibleMove to be
compared in full */
if ( scoreQualifies( engine, score ) ) {
qualifies = scoreQualifies( engine, score );
if ( qualifies || !!engine->printer ) {
posmove->score = score;
XP_MEMSET( &posmove->blankVals, 0, sizeof(posmove->blankVals) );
for ( ii = 0; ii < usedBlanksCount; ++ii ) {
@ -1136,7 +1152,13 @@ considerScoreWordHasBlanks( EngineCtxt* engine, XP_U16 blanksLeft,
XP_ASSERT( posmove->moveInfo.isHorizontal ==
engine->searchHorizontal );
posmove->moveInfo.commonCoord = (XP_U8)lastRow;
saveMoveIfQualifies( engine, posmove );
if ( qualifies ) {
saveMoveIfQualifies( engine, posmove );
}
if ( !!engine->printer ) {
(*engine->printer)( engine->printClosure, score,
&posmove->moveInfo );
}
}
} else {
Tile bTile;

6
xwords4/common/engine.h
View file

@ -48,6 +48,12 @@ void engine_init( EngineCtxt* ctxt );
void engine_reset( EngineCtxt* ctxt );
void engine_destroy( EngineCtxt* ctxt );
#ifdef TEXT_MODEL
typedef void (*MovePrintFunc)( void* closure, XP_U16 score,
const MoveInfo* move );
void engine_setPrinter( EngineCtxt* ctxt, MovePrintFunc proc, void* closure );
#endif
XP_Bool engine_findMove( EngineCtxt* ctxt, const ModelCtxt* model,
XP_U16 turn, const Tile* tiles,
XP_U16 nTiles, XP_Bool usePrev,