aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
commit 135fed79ca
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/server_game.cpp
View file

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

1
common/server_game.h
View file

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

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