Merge branch 'relay_proxy' of ssh://xwords.git.sourceforge.net/gitroot/xwords/xwords into relay_proxy

This commit is contained in:
eehouse@eehouse.org 2010-09-12 02:34:20 -07:00 committed by Andy2
commit 0b46455044

View file

@ -1628,7 +1628,6 @@ getPlayerTime( ServerCtxt* server, XWStreamCtxt* stream, XP_U16 turn )
static void
nextTurn( ServerCtxt* server, XP_S16 nxtTurn )
{
ServerPlayer* player;
XP_U16 nPlayers = server->vol.gi->nPlayers;
XP_U16 playerTilesLeft;
XP_S16 currentTurn = server->nv.currentTurn;
@ -1649,7 +1648,6 @@ nextTurn( ServerCtxt* server, XP_S16 nxtTurn )
if ( (playerTilesLeft > 0) && tileCountsOk(server) && NPASSES_OK(server) ){
player = &server->players[nxtTurn];
setTurn( server, nxtTurn );
} else {