remove mistaken code (replacing with assert for now)

This commit is contained in:
Eric House 2020-04-29 12:31:31 -07:00
parent fb2fcf15cc
commit 5eef348a6c

View file

@ -2058,6 +2058,7 @@ static void
bwiFromStream( MPFORMAL XWStreamCtxt* stream, BadWordInfo* bwi ) bwiFromStream( MPFORMAL XWStreamCtxt* stream, BadWordInfo* bwi )
{ {
XP_U16 nWords = stream_getBits( stream, 4 ); XP_U16 nWords = stream_getBits( stream, 4 );
XP_ASSERT( nWords < VSIZE(bwi->words) - 1 );
bwi->nWords = nWords; bwi->nWords = nWords;
bwi->dictName = ( STREAM_VERS_DICTNAME <= stream_getVersion( stream ) ) bwi->dictName = ( STREAM_VERS_DICTNAME <= stream_getVersion( stream ) )
@ -3843,8 +3844,7 @@ setTurn( ServerCtxt* server, XWEnv xwe, XP_S16 turn )
if ( DUP_PLAYER == turn && inDupMode ) { if ( DUP_PLAYER == turn && inDupMode ) {
turn = dupe_nextTurn( server ); turn = dupe_nextTurn( server );
} else if ( PICK_CUR == turn ) { } else if ( PICK_CUR == turn ) {
XP_ASSERT( !inDupMode ); XP_ASSERT(0); /* this should never happen */
turn = model_getNextTurn( server->vol.model );
} else if ( 0 <= turn && !inDupMode ) { } else if ( 0 <= turn && !inDupMode ) {
XP_ASSERT( turn == model_getNextTurn( server->vol.model ) ); XP_ASSERT( turn == model_getNextTurn( server->vol.model ) );
} }