jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

server crash fix

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-03-11 15:35:31 +01:00
parent 712aa9768f
commit 29c4c80ddf
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
common/server_game.cpp
View file

@ -210,7 +210,25 @@ Server_Player *Server_Game::addPlayer(Server_ProtocolHandler *handler, bool spec
void Server_Game::removePlayer(Server_Player *player)
{
players.remove(player->getPlayerId());
removeArrowsToPlayer(player);
sendGameEvent(new Event_Leave(player->getPlayerId()));
bool playerActive = activePlayer == player->getPlayerId();
bool spectator = player->getSpectator();
delete player;
if (!getPlayerCount())
deleteLater();
else if (!spectator) {
stopGameIfFinished();
if (gameStarted && playerActive)
nextTurn();
}
qobject_cast<Server_Room *>(parent())->broadcastGameListUpdate(this);
}
void Server_Game::removeArrowsToPlayer(Server_Player *player)
{
// Remove all arrows of other players pointing to the player being removed or to one of his cards.
QMapIterator<int, Server_Player *> playerIterator(players);
while (playerIterator.hasNext()) {
@ -231,20 +249,6 @@ void Server_Game::removePlayer(Server_Player *player)
p->deleteArrow(toDelete[i]->getId());
}
}
sendGameEvent(new Event_Leave(player->getPlayerId()));
bool playerActive = activePlayer == player->getPlayerId();
bool spectator = player->getSpectator();
delete player;
if (!getPlayerCount())
deleteLater();
else if (!spectator) {
stopGameIfFinished();
if (gameStarted && playerActive)
nextTurn();
}
qobject_cast<Server_Room *>(parent())->broadcastGameListUpdate(this);
}
bool Server_Game::kickPlayer(int playerId)