aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:mbruker/Cockatrice

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-04-22 10:58:15 +02:00
commit 0a30f22e5f
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
common/server_game.cpp
View file

@ -266,7 +266,7 @@ void Server_Game::removePlayer(Server_Player *player)
QMutexLocker locker(&gameMutex);
players.remove(player->getPlayerId());
removeArrowsToPlayer(player);
removeArrowsRelatedToPlayer(player);
sendGameEvent(new Event_Leave(player->getPlayerId()));
bool playerActive = activePlayer == player->getPlayerId();
@ -299,11 +299,13 @@ void Server_Game::removePlayer(Server_Player *player)
room->broadcastGameListUpdate(this);
}
void Server_Game::removeArrowsToPlayer(Server_Player *player)
void Server_Game::removeArrowsRelatedToPlayer(Server_Player *player)
{
QMutexLocker locker(&gameMutex);
// Remove all arrows of other players pointing to the player being removed or to one of his cards.
// Also remove all arrows starting at one of his cards. This is necessary since players can create
// arrows that start at another person's cards.
QMapIterator<int, Server_Player *> playerIterator(players);
while (playerIterator.hasNext()) {
Server_Player *p = playerIterator.next().value();
@ -315,7 +317,11 @@ void Server_Game::removeArrowsToPlayer(Server_Player *player)
if (targetCard) {
if (targetCard->getZone()->getPlayer() == player)
toDelete.append(a);
} else if ((static_cast<Server_Player *>(a->getTargetItem()) == player) || (a->getStartCard()->getZone()->getPlayer() == player))
} else if (static_cast<Server_Player *>(a->getTargetItem()) == player)
toDelete.append(a);
// Don't use else here! It has to happen regardless of whether targetCard == 0.
if (a->getStartCard()->getZone()->getPlayer() == player)
toDelete.append(a);
}
for (int i = 0; i < toDelete.size(); ++i) {

2
common/server_game.h
View file

@ -82,7 +82,7 @@ public:
bool containsUser(const QString &userName) const;
Server_Player *addPlayer(Server_ProtocolHandler *handler, bool spectator, bool broadcastUpdate = true);
void removePlayer(Server_Player *player);
void removeArrowsToPlayer(Server_Player *player);
void removeArrowsRelatedToPlayer(Server_Player *player);
bool kickPlayer(int playerId);
void startGameIfReady();
void stopGameIfFinished();

2
common/server_protocolhandler.cpp
View file

@ -632,7 +632,7 @@ ResponseCode Server_ProtocolHandler::cmdConcede(Command_Concede * /*cmd*/, Comma
return RespContextError;
player->setConceded(true);
game->removeArrowsToPlayer(player);
game->removeArrowsRelatedToPlayer(player);
player->clearZones();
game->sendGameEvent(new Event_PlayerPropertiesChanged(player->getPlayerId(), player->getProperties()), new Context_Concede);
game->stopGameIfFinished();