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

Conflicts:
	common/server_game.cpp

common/server_game.cpp

@@ -138,7 +138,8 @@ void Server_Game::startGameIfReady()
 		query.exec();
 	}
 */	
-	setActivePlayer(players.keys().first());
+	activePlayer = -1;
+	nextTurn();
 }
 
 void Server_Game::stopGameIfFinished()
@@ -254,6 +255,21 @@ void Server_Game::setActivePhase(int _activePhase)
 	sendGameEvent(new Event_SetActivePhase(-1, activePhase));
 }
 
+void Server_Game::nextTurn()
+{
+	const QList<int> keys = players.keys();
+	int listPos = -1;
+	if (activePlayer != -1)
+		listPos = keys.indexOf(activePlayer);
+	do {
+		++listPos;
+		if (listPos == keys.size())
+			listPos = 0;
+	} while (players.value(keys[listPos])->getSpectator());
+	
+	setActivePlayer(keys[listPos]);
+}
+
 QList<ServerInfo_Player *> Server_Game::getGameState(Server_Player *playerWhosAsking) const
 {
 	QList<ServerInfo_Player *> result;

common/server_game.h

@@ -76,6 +76,7 @@ public:
 	int getActivePhase() const { return activePhase; }
 	void setActivePlayer(int _activePlayer);
 	void setActivePhase(int _activePhase);
+	void nextTurn();
 
 	QList<ServerInfo_Player *> getGameState(Server_Player *playerWhosAsking) const;
 	void sendGameEvent(GameEvent *event, GameEventContext *context = 0, Server_Player *exclude = 0);

common/server_protocolhandler.cpp

@@ -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;
 }