Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to compile -- graft missed a constant defined earlier

Browse source
This commit is contained in:
Eric House 2014-10-09 21:21:27 -07:00
parent badc40f90b
commit 4eb836ab2b
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/common/board.c
View file

@ -256,7 +256,7 @@ board_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,
arrow->vert = (XP_Bool)stream_getBits( stream, 1 ); arrow->vert = (XP_Bool)stream_getBits( stream, 1 );
arrow->visible = (XP_Bool)stream_getBits( stream, 1 ); arrow->visible = (XP_Bool)stream_getBits( stream, 1 );
if ( STREAM_VERS_MULTIADDR > version ) { if ( STREAM_VERS_MODELDIVIDER > version ) {
(void)stream_getBits( stream, NTILES_NBITS ); (void)stream_getBits( stream, NTILES_NBITS );
} }
pti->traySelBits = (TileBit)stream_getBits( stream, pti->traySelBits = (TileBit)stream_getBits( stream,
@ -2022,7 +2022,9 @@ board_requestHint( BoardCtxt* board,
const Tile* tiles; const Tile* tiles;
XP_Bool searchComplete = XP_TRUE; XP_Bool searchComplete = XP_TRUE;
const XP_U16 selPlayer = board->selPlayer; const XP_U16 selPlayer = board->selPlayer;
#ifdef XWFEATURE_SEARCHLIMIT
PerTurnInfo* pti = board->selInfo; PerTurnInfo* pti = board->selInfo;
#endif
EngineCtxt* engine = server_getEngineFor( board->server, selPlayer ); EngineCtxt* engine = server_getEngineFor( board->server, selPlayer );
const TrayTileSet* tileSet; const TrayTileSet* tileSet;
ModelCtxt* model = board->model; ModelCtxt* model = board->model;

3
xwords4/common/comtypes.h
View file

@ -47,6 +47,7 @@
#endif #endif
#define MAX_COLS MAX_ROWS #define MAX_COLS MAX_ROWS
#define STREAM_VERS_MODELDIVIDER 0x17
#define STREAM_VERS_COMMSBACKOFF 0x16 #define STREAM_VERS_COMMSBACKOFF 0x16
#define STREAM_VERS_DICTNAME 0x15 #define STREAM_VERS_DICTNAME 0x15
#ifdef HASH_STREAM #ifdef HASH_STREAM
@ -84,7 +85,7 @@
#define STREAM_VERS_405 0x01 #define STREAM_VERS_405 0x01
/* search for FIX_NEXT_VERSION_CHANGE next time this is changed */ /* search for FIX_NEXT_VERSION_CHANGE next time this is changed */
#define CUR_STREAM_VERS STREAM_VERS_COMMSBACKOFF #define CUR_STREAM_VERS STREAM_VERS_MODELDIVIDER
typedef struct XP_Rect { typedef struct XP_Rect {
XP_S16 left; XP_S16 left;

2
xwords4/common/model.c
View file

@ -2460,7 +2460,7 @@ loadPlayerCtxt( const ModelCtxt* model, XWStreamCtxt* stream, XP_U16 version,
XP_ASSERT( 0 == pc->nUndone ); XP_ASSERT( 0 == pc->nUndone );
} }
XP_ASSERT( 0 == pc->dividerLoc ); XP_ASSERT( 0 == pc->dividerLoc );
if ( STREAM_VERS_MULTIADDR <= version ) { if ( STREAM_VERS_MODELDIVIDER <= version ) {
pc->dividerLoc = stream_getBits( stream, NTILES_NBITS ); pc->dividerLoc = stream_getBits( stream, NTILES_NBITS );
} }