diff --git a/cockatrice/src/client/tabs/tab_game.cpp b/cockatrice/src/client/tabs/tab_game.cpp index d639c242c..dfa818d74 100644 --- a/cockatrice/src/client/tabs/tab_game.cpp +++ b/cockatrice/src/client/tabs/tab_game.cpp @@ -415,11 +415,6 @@ void TabGame::adminLockChanged(bool lock) sayEdit->setVisible(v); } -bool TabGame::isSpectator() -{ - return spectator; -} - void TabGame::actGameInfo() { DlgCreateGame dlg(gameInfo, roomGameTypes, this); diff --git a/cockatrice/src/client/tabs/tab_game.h b/cockatrice/src/client/tabs/tab_game.h index 96e902c2e..b46aac0a1 100644 --- a/cockatrice/src/client/tabs/tab_game.h +++ b/cockatrice/src/client/tabs/tab_game.h @@ -235,15 +235,14 @@ public: return gameInfo.game_id(); } QString getTabText() const override; - bool getSpectator() const + bool isSpectator() const { return spectator; } - bool getSpectatorsSeeEverything() const + bool isSpectatorsOmniscient() const { return gameInfo.spectators_omniscient(); } - bool isSpectator(); Player *getActiveLocalPlayer() const; AbstractClient *getClientForPlayer(int playerId) const; diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index d0336e4e5..1fb77426e 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -259,7 +259,7 @@ void CardItem::deleteDragItem() void CardItem::drawArrow(const QColor &arrowColor) { - if (static_cast(owner->parent())->getSpectator()) + if (static_cast(owner->parent())->isSpectator()) return; Player *arrowOwner = static_cast(owner->parent())->getActiveLocalPlayer(); @@ -282,7 +282,7 @@ void CardItem::drawArrow(const QColor &arrowColor) void CardItem::drawAttachArrow() { - if (static_cast(owner->parent())->getSpectator()) + if (static_cast(owner->parent())->isSpectator()) return; auto *arrow = new ArrowAttachItem(this); diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 008d13e40..ccdf3e68f 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -150,8 +150,7 @@ Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, T stack = addZone(new StackZone(this, (int)table->boundingRect().height(), this)); - hand = addZone(new HandZone(this, - _local || _judge || (_parent->getSpectator() && _parent->getSpectatorsSeeEverything()), + hand = addZone(new HandZone(this, _local || _judge || (_parent->isSpectator() && _parent->isSpectatorsOmniscient()), (int)table->boundingRect().height(), this)); connect(hand, &HandZone::cardCountChanged, handCounter, &HandCounter::updateNumber); connect(handCounter, &HandCounter::showContextMenu, hand, &HandZone::showContextMenu); @@ -2782,7 +2781,7 @@ void Player::processPlayerInfo(const ServerInfo_Player &info) switch (zoneInfo.type()) { case ServerInfo_Zone::PrivateZone: - contentsKnown = local || judge || (game->getSpectator() && game->getSpectatorsSeeEverything()); + contentsKnown = local || judge || (game->isSpectator() && game->isSpectatorsOmniscient()); break; case ServerInfo_Zone::PublicZone: