mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-28 09:58:30 +01:00
cleanup: NULL's a legal value now.
This commit is contained in:
parent
b02e0eb9cf
commit
8062a027e7
1 changed files with 3 additions and 7 deletions
|
@ -2375,11 +2375,11 @@ sendUndoToClientsExcept( ServerCtxt* server, XP_U16 skip,
|
||||||
}
|
}
|
||||||
} /* sendUndoToClientsExcept */
|
} /* sendUndoToClientsExcept */
|
||||||
|
|
||||||
|
/* This is unused on Android where I've disabled undo in networked games. */
|
||||||
static XP_Bool
|
static XP_Bool
|
||||||
reflectUndos( ServerCtxt* server, XWStreamCtxt* stream, XW_Proto code )
|
reflectUndos( ServerCtxt* server, XWStreamCtxt* stream, XW_Proto code )
|
||||||
{
|
{
|
||||||
XP_U16 nUndone, lastUndone;
|
XP_U16 nUndone, lastUndone;
|
||||||
XP_S16 moveNum;
|
|
||||||
XP_U16 turn;
|
XP_U16 turn;
|
||||||
ModelCtxt* model = server->vol.model;
|
ModelCtxt* model = server->vol.model;
|
||||||
XP_Bool success = XP_TRUE;
|
XP_Bool success = XP_TRUE;
|
||||||
|
@ -2387,13 +2387,9 @@ reflectUndos( ServerCtxt* server, XWStreamCtxt* stream, XW_Proto code )
|
||||||
nUndone = stream_getU16( stream );
|
nUndone = stream_getU16( stream );
|
||||||
lastUndone = stream_getU16( stream );
|
lastUndone = stream_getU16( stream );
|
||||||
|
|
||||||
moveNum = lastUndone + nUndone - 1;
|
success = model_undoLatestMoves( model, server->pool, nUndone, &turn,
|
||||||
|
NULL );
|
||||||
success = model_undoLatestMoves(model, server->pool, nUndone, &turn,
|
|
||||||
&moveNum);
|
|
||||||
|
|
||||||
if ( success ) {
|
if ( success ) {
|
||||||
XP_ASSERT( moveNum == lastUndone );
|
|
||||||
|
|
||||||
if ( code == XWPROTO_UNDO_INFO_CLIENT ) { /* need to inform */
|
if ( code == XWPROTO_UNDO_INFO_CLIENT ) { /* need to inform */
|
||||||
XP_U16 sourceClientIndex =
|
XP_U16 sourceClientIndex =
|
||||||
|
|
Loading…
Reference in a new issue