Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove return from middle of function

Browse source
This commit is contained in:
Eric House 2013-10-27 21:47:49 -07:00
parent b0a4d529a5
commit 53e6db5683
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
xwords4/common/model.c
View file

@ -596,6 +596,7 @@ model_getTile( const ModelCtxt* model, XP_U16 col, XP_U16 row,
{ {
CellTile cellTile = getModelTileRaw( model, col, row ); CellTile cellTile = getModelTileRaw( model, col, row );
XP_Bool pending = XP_FALSE; XP_Bool pending = XP_FALSE;
XP_Bool inUse = XP_TRUE;
if ( (cellTile & TILE_PENDING_BIT) != 0 ) { if ( (cellTile & TILE_PENDING_BIT) != 0 ) {
if ( getPending if ( getPending
@ -609,24 +610,22 @@ model_getTile( const ModelCtxt* model, XP_U16 col, XP_U16 row,
} }
/* this needs to happen after the above b/c cellTile gets changed */ /* this needs to happen after the above b/c cellTile gets changed */
if ( (cellTile & TILE_EMPTY_BIT) != 0 ) { inUse = 0 == (cellTile & TILE_EMPTY_BIT);
return XP_FALSE; if ( inUse ) {
if ( NULL != tileP ) {
*tileP = cellTile & TILE_VALUE_MASK;
}
if ( NULL != isBlank ) {
*isBlank = IS_BLANK(cellTile);
}
if ( NULL != pendingP ) {
*pendingP = pending;
}
if ( !!recentP ) {
*recentP = (cellTile & PREV_MOVE_BIT) != 0;
}
} }
return inUse;
if ( NULL != tileP ) {
*tileP = cellTile & TILE_VALUE_MASK;
}
if ( NULL != isBlank ) {
*isBlank = IS_BLANK(cellTile);
}
if ( NULL != pendingP ) {
*pendingP = pending;
}
if ( !!recentP ) {
*recentP = (cellTile & PREV_MOVE_BIT) != 0;
}
return XP_TRUE;
} /* model_getTile */ } /* model_getTile */
void void