A bit of cleanup; no code change.

This commit is contained in:
ehouse 2008-05-11 15:23:22 +00:00
parent cf6a3db940
commit 1a2ce36bb0

View file

@ -2051,16 +2051,14 @@ board_beginTrade( BoardCtxt* board )
trade */ trade */
if ( 0 != model_getCurrentMoveCount( board->model, board->selPlayer )){ if ( 0 != model_getCurrentMoveCount( board->model, board->selPlayer )){
util_userError( board->util, ERR_CANT_TRADE_MID_MOVE ); util_userError( board->util, ERR_CANT_TRADE_MID_MOVE );
} else if ( server_countTilesInPool(board->server) < MIN_TRADE_TILES){
util_userError( board->util, ERR_TOO_FEW_TILES_LEFT_TO_TRADE );
} else { } else {
if ( server_countTilesInPool(board->server) < MIN_TRADE_TILES){ board->tradingMiniWindowInvalid = XP_TRUE;
util_userError( board->util, ERR_TOO_FEW_TILES_LEFT_TO_TRADE ); board->needsDrawing = XP_TRUE;
} else { board->tradeInProgress[board->selPlayer] = XP_TRUE;
board->tradingMiniWindowInvalid = XP_TRUE; setArrowVisible( board, XP_FALSE );
board->needsDrawing = XP_TRUE; result = XP_TRUE;
board->tradeInProgress[board->selPlayer] = XP_TRUE;
setArrowVisible( board, XP_FALSE );
result = XP_TRUE;
}
} }
} }
return result; return result;