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

This commit is contained in:
Max-Wilhelm Bruker
2010-07-17 18:24:37 +02:00
3 changed files with 32 additions and 4 deletions

View File

@@ -303,7 +303,7 @@ QList<ServerInfo_Player *> Server_Game::getGameState(Server_Player *playerWhosAs
Server_CardZone *zone = zoneIterator.next().value();
QList<ServerInfo_Card *> cardList;
if (
((playerWhosAsking == player) && (zone->getType() != HiddenZone))
(((playerWhosAsking == player) || (playerWhosAsking->getSpectator() && spectatorsSeeEverything)) && (zone->getType() != HiddenZone))
|| ((playerWhosAsking != player) && (zone->getType() == PublicZone))
) {
QListIterator<Server_Card *> cardIterator(zone->cards);