gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-21 23:00:24 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice

Browse Source 
Conflicts:
	common/server_game.cpp
This commit is contained in:
Max-Wilhelm Bruker
2010-09-07 03:55:56 +02:00
parent c4c1723205 ad40194f25
commit 135fed79ca
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/server_protocolhandler.cpp
View File

@@ -958,18 +958,7 @@ ResponseCode Server_ProtocolHandler::cmdNextTurn(Command_NextTurn * /*cmd*/, Com
if (!game->getGameStarted())
return RespGameNotStarted;
const QMap<int, Server_Player *> &players = game->getPlayers();
const QList<int> keys = players.keys();
int activePlayer = game->getActivePlayer();
int listPos = keys.indexOf(activePlayer);
do {
++listPos;
if (listPos == keys.size())
listPos = 0;
} while (players.value(keys[listPos])->getSpectator());
game->setActivePlayer(keys[listPos]);
game->nextTurn();
return RespOk;
}