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

fix b5 crasher: check for stream equivalence with the older version

Browse source 
now that current version's been upped.  Rename old version to better
indicate when it was current.
This commit is contained in:
ehouse 2006-03-04 06:12:38 +00:00
parent 3e06bc56f7
commit 942979ddd0
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/board.c
View file

@ -208,7 +208,7 @@ board_makeFromStream( MPFORMAL XWStreamCtxt* stream, ModelCtxt* model,
#endif #endif
#ifdef XWFEATURE_SEARCHLIMIT #ifdef XWFEATURE_SEARCHLIMIT
if ( stream_getVersion( stream ) >= CUR_STREAM_VERS ) { if ( stream_getVersion( stream ) >= STREAM_VERS_41b4 ) {
board->hasHintRect[i] = stream_getBits( stream, 1 ); board->hasHintRect[i] = stream_getBits( stream, 1 );
} else { } else {
board->hasHintRect[i] = XP_FALSE; board->hasHintRect[i] = XP_FALSE;

9
common/game.c
View file

@ -380,19 +380,14 @@ gi_readFromStream( MPFORMAL XWStreamCtxt* stream, CurGameInfo* gi )
gi->phoniesAction = (XWPhoniesChoice)stream_getBits( stream, 2 ); gi->phoniesAction = (XWPhoniesChoice)stream_getBits( stream, 2 );
gi->timerEnabled = stream_getBits( stream, 1 ); gi->timerEnabled = stream_getBits( stream, 1 );
if ( strVersion >= CUR_STREAM_VERS ) { if ( strVersion >= STREAM_VERS_41b4 ) {
gi->allowPickTiles = stream_getBits( stream, 1 ); gi->allowPickTiles = stream_getBits( stream, 1 );
} else {
gi->allowPickTiles = XP_FALSE;
}
if ( strVersion >= CUR_STREAM_VERS ) {
gi->allowHintRect = stream_getBits( stream, 1 ); gi->allowHintRect = stream_getBits( stream, 1 );
} else { } else {
gi->allowPickTiles = XP_FALSE;
gi->allowHintRect = XP_FALSE; gi->allowHintRect = XP_FALSE;
} }
gi->gameID = stream_getU16( stream ); gi->gameID = stream_getU16( stream );
if ( gi->timerEnabled ) { if ( gi->timerEnabled ) {
gi->gameSeconds = stream_getU16( stream ); gi->gameSeconds = stream_getU16( stream );

2
common/game.h
View file

@ -32,7 +32,7 @@ extern "C" {
#define CUR_STREAM_VERS 0x03 #define CUR_STREAM_VERS 0x03
#define STREAM_VERS_41 0x02 #define STREAM_VERS_41b4 0x02
#define STREAM_VERS_405 0x01 #define STREAM_VERS_405 0x01
typedef struct LocalPlayer { typedef struct LocalPlayer {

2
common/server.c
View file

@ -236,7 +236,7 @@ getNV( XWStreamCtxt* stream, ServerNonvolatiles* nv, XP_U16 nPlayers )
(void)stream_getBits( stream, 3 ); /* was npassesinrow */ (void)stream_getBits( stream, 3 ); /* was npassesinrow */
nv->nDevices = (XP_U8)stream_getBits( stream, NDEVICES_NBITS ); nv->nDevices = (XP_U8)stream_getBits( stream, NDEVICES_NBITS );
if ( stream_getVersion( stream ) > STREAM_VERS_41 ) { if ( stream_getVersion( stream ) > STREAM_VERS_41b4 ) {
++nv->nDevices; ++nv->nDevices;
} }