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

Base the number of bytes used to store tiles on the number in the

Browse source 
current dictionary.  This allows us to continue to open games saved
with older code using older dictionaries while still supporting the
new format for up to 64 tiles.  Old versions may crash when opening
games created by new versions, but that's probably ok.
This commit is contained in:
ehouse 2006-08-10 01:21:31 +00:00
parent c41b211735
commit 0b868f5b53
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/common/model.c
View file

@ -81,13 +81,14 @@ model_make( MPFORMAL DictionaryCtxt* dict, XW_UtilCtxt* util, XP_U16 nCols,
XP_MEMSET( result, 0, sizeof(*result) );
MPASSIGN(result->vol.mpool, mpool);
result->vol.dict = dict;
result->vol.util = util;
model_init( result, nCols, nRows );
XP_ASSERT( !!util->gameInfo );
result->vol.gi = util->gameInfo;
model_setDictionary( result, dict );
}
return result;
@ -261,7 +262,13 @@ model_setNPlayers( ModelCtxt* model, XP_U16 nPlayers )
void
model_setDictionary( ModelCtxt* model, DictionaryCtxt* dict )
{
model->vol.dict = dict;
model->vol.dict = dict;
if ( !!dict ) {
XP_U16 nFaces = dict_numTileFaces( dict );
XP_ASSERT( !!model->vol.stack );
stack_setBitsPerTile( model->vol.stack, nFaces <= 32? 5 : 6 );
}
} /* model_setDictionary */
DictionaryCtxt*

34
xwords4/common/movestak.c
View file

@ -41,6 +41,7 @@ struct StackCtxt {
XP_U16 cacheNext;
XP_U16 nEntries;
XP_U16 bitsPerTile;
XP_U16 highWaterMark;
MPSLOT
@ -56,6 +57,14 @@ stack_init( StackCtxt* stack )
shrunk to fit as soon as we serialize/deserialize anyway. */
} /* stack_init */
void
stack_setBitsPerTile( StackCtxt* stack, XP_U16 bitsPerTile )
{
XP_ASSERT( !!stack );
XP_LOGF( "%s(%d)", __FUNCTION__, bitsPerTile );
stack->bitsPerTile = bitsPerTile;
}
StackCtxt*
stack_make( MPFORMAL VTableMgr* vtmgr )
{
@ -118,7 +127,7 @@ stack_writeToStream( StackCtxt* stack, XWStreamCtxt* stream )
static void
pushEntry( StackCtxt* stack, const StackEntry* entry )
{
XP_U16 i;
XP_U16 i, bitsPerTile;
XWStreamPos oldLoc;
XP_U16 nTiles = entry->u.move.moveInfo.nTiles;
XWStreamCtxt* stream = stack->data;
@ -141,11 +150,16 @@ pushEntry( StackCtxt* stack, const StackEntry* entry )
stream_putBits( stream, NTILES_NBITS, nTiles );
stream_putBits( stream, 5, entry->u.move.moveInfo.commonCoord );
stream_putBits( stream, 1, entry->u.move.moveInfo.isHorizontal );
bitsPerTile = stack->bitsPerTile;
XP_ASSERT( bitsPerTile == 5 || bitsPerTile == 6 );
for ( i = 0; i < nTiles; ++i ) {
Tile tile;
stream_putBits( stream, 5,
entry->u.move.moveInfo.tiles[i].varCoord );
stream_putBits( stream, TILE_NBITS+1, /* 1 for blank */
entry->u.move.moveInfo.tiles[i].tile );
tile = entry->u.move.moveInfo.tiles[i].tile;
stream_putBits( stream, bitsPerTile, tile & TILE_VALUE_MASK );
stream_putBits( stream, 1, (tile & TILE_BLANK_BIT) != 0 );
}
if ( entry->moveType == MOVE_TYPE ) {
traySetToStream( stream, &entry->u.move.newTiles );
@ -174,7 +188,7 @@ pushEntry( StackCtxt* stack, const StackEntry* entry )
static void
readEntry( StackCtxt* stack, StackEntry* entry )
{
XP_U16 nTiles, i;
XP_U16 nTiles, i, bitsPerTile;
XWStreamCtxt* stream = stack->data;
entry->moveType = (StackMoveType)stream_getBits( stream, 2 );
@ -189,13 +203,17 @@ readEntry( StackCtxt* stack, StackEntry* entry )
XP_ASSERT( nTiles <= MAX_TRAY_TILES );
entry->u.move.moveInfo.commonCoord = (XP_U8)stream_getBits(stream, 5);
entry->u.move.moveInfo.isHorizontal = (XP_U8)stream_getBits(stream, 1);
bitsPerTile = stack->bitsPerTile;
XP_ASSERT( bitsPerTile == 5 || bitsPerTile == 6 );
for ( i = 0; i < nTiles; ++i ) {
Tile tile;
entry->u.move.moveInfo.tiles[i].varCoord =
(XP_U8)stream_getBits(stream, 5);
/* PENDING: this is changing from 6 to 7. Need to detect old
version and be able to open it!!! */
entry->u.move.moveInfo.tiles[i].tile =
(Tile)stream_getBits( stream, TILE_NBITS + 1 );
tile = (Tile)stream_getBits( stream, bitsPerTile );
if ( 0 != stream_getBits( stream, 1 ) ) {
tile |= TILE_BLANK_BIT;
}
entry->u.move.moveInfo.tiles[i].tile = tile;
}
if ( entry->moveType == MOVE_TYPE ) {

1
xwords4/common/movestak.h
View file

@ -69,6 +69,7 @@ StackCtxt* stack_make( MPFORMAL VTableMgr* vtmgr );
void stack_destroy( StackCtxt* stack );
void stack_init( StackCtxt* stack );
void stack_setBitsPerTile( StackCtxt* stack, XP_U16 bitsPerTile );
void stack_loadFromStream( StackCtxt* stack, XWStreamCtxt* stream );
void stack_writeToStream( StackCtxt* stack, XWStreamCtxt* stream );