cleanup: NULL's a legal value now.

This commit is contained in:
Andy2 2011-10-17 06:48:13 -07:00
parent b02e0eb9cf
commit 8062a027e7

View file

@ -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 =