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

factor some work of picking tiles/blanks into common code; add option

Browse source 
for user to pick tiles from pool.
This commit is contained in:
ehouse 2003-11-16 17:09:11 +00:00
parent d27288088e
commit 3721152605
1 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
common/model.c
View file

@ -832,6 +832,68 @@ model_removePlayerTile( ModelCtxt* model, XP_S16 turn, XP_S16 index )
return tile;
} /* model_removePlayerTile */
void
model_packTilesUtil( ModelCtxt* model, PoolContext* pool,
XP_Bool includeBlank,
XP_U16* nUsed, XP_UCHAR4* texts,
Tile* tiles )
{
DictionaryCtxt* dict = model->vol.dict;
XP_U16 nFaces = dict_numTileFaces( dict );
Tile blankFace = dict_getBlankTile( dict );
Tile tile;
XP_U16 nFacesAvail = 0;
XP_ASSERT( nFaces <= *nUsed );
for ( tile = 0; tile < nFaces; ++tile ) {
XP_U16 nChars;
if ( includeBlank ) {
XP_ASSERT( !!pool );
if ( pool_getNTilesLeftFor( pool, tile ) == 0 ) {
continue;
}
} else if ( tile == blankFace ) {
continue;
}
tiles[nFacesAvail] = tile;
nChars = dict_tilesToString( dict, &tile, 1,
(XP_UCHAR*)&texts[nFacesAvail] );
XP_ASSERT( nChars < sizeof(texts[0]) );
++nFacesAvail;
}
*nUsed = nFacesAvail;
} /* model_packTilesUtil */
static Tile
askBlankTile( ModelCtxt* model, XP_U16 turn )
{
XP_U16 nUsed = MAX_UNIQUE_TILES;
XP_S16 chosen;
XP_UCHAR4 tfaces[MAX_UNIQUE_TILES];
Tile tiles[MAX_UNIQUE_TILES];
PickInfo pi;
pi.why = PICK_FOR_BLANK;
pi.nTotal = 1;
pi.thisPick = 1;
model_packTilesUtil( model, NULL, XP_FALSE,
&nUsed, tfaces, tiles );
chosen = util_userPickTile( model->vol.util, &pi,
turn, tfaces, nUsed );
if ( chosen < 0 ) {
chosen = 0;
}
return tiles[chosen];
} /* askBlankTile */
void
model_moveTrayToBoard( ModelCtxt* model, XP_S16 turn, XP_U16 col, XP_U16 row,
XP_S16 tileIndex, Tile blankFace )
@ -845,9 +907,8 @@ model_moveTrayToBoard( ModelCtxt* model, XP_S16 turn, XP_U16 col, XP_U16 row,
if ( blankFace != EMPTY_TILE ) {
tile = blankFace;
} else {
XP_UCHAR face[4];
util_askBlankFace( model->vol.util, model->vol.dict, face );
tile = dict_tileForString( model->vol.dict, face );
XP_ASSERT( turn >= 0 );
tile = askBlankTile( model, (XP_U16)turn );
}
tile |= TILE_BLANK_BIT;
}