From 1851f71850ff461942ed00f65910acd07de4a7e9 Mon Sep 17 00:00:00 2001 From: Basile Clement Date: Sat, 15 Mar 2025 20:09:14 +0100 Subject: [PATCH] Remove revealedCard flag from CardItem (#5723) It is no longer used since #5254. --- cockatrice/src/game/cards/card_item.cpp | 5 ++--- cockatrice/src/game/cards/card_item.h | 6 ------ cockatrice/src/game/zones/view_zone.cpp | 7 +++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/cockatrice/src/game/cards/card_item.cpp b/cockatrice/src/game/cards/card_item.cpp index 67515e978..a16fd71b1 100644 --- a/cockatrice/src/game/cards/card_item.cpp +++ b/cockatrice/src/game/cards/card_item.cpp @@ -22,10 +22,9 @@ CardItem::CardItem(Player *_owner, const QString &_name, const QString &_providerId, int _cardid, - bool _revealedCard, CardZone *_zone) - : AbstractCardItem(parent, _name, _providerId, _owner, _cardid), zone(_zone), revealedCard(_revealedCard), - attacking(false), destroyOnZoneChange(false), doesntUntap(false), dragItem(nullptr), attachedTo(nullptr) + : AbstractCardItem(parent, _name, _providerId, _owner, _cardid), zone(_zone), attacking(false), + destroyOnZoneChange(false), doesntUntap(false), dragItem(nullptr), attachedTo(nullptr) { owner->addCard(this); diff --git a/cockatrice/src/game/cards/card_item.h b/cockatrice/src/game/cards/card_item.h index 2c77af20e..5b4b325ba 100644 --- a/cockatrice/src/game/cards/card_item.h +++ b/cockatrice/src/game/cards/card_item.h @@ -22,7 +22,6 @@ class CardItem : public AbstractCardItem Q_OBJECT private: CardZone *zone; - bool revealedCard; bool attacking; QMap counters; QString annotation; @@ -55,7 +54,6 @@ public: const QString &_name = QString(), const QString &_providerId = QString(), int _cardid = -1, - bool revealedCard = false, CardZone *_zone = nullptr); ~CardItem() override; void retranslateUi(); @@ -85,10 +83,6 @@ public: { owner = _owner; } - bool getRevealedCard() const - { - return revealedCard; - } bool getAttacking() const { return attacking; diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index d86e71f90..9e9ba6e81 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -70,7 +70,7 @@ void ZoneViewZone::initializeCards(const QList &cardLis if (!cardList.isEmpty()) { for (int i = 0; i < cardList.size(); ++i) addCard(new CardItem(player, this, QString::fromStdString(cardList[i]->name()), - QString::fromStdString(cardList[i]->provider_id()), cardList[i]->id(), revealZone), + QString::fromStdString(cardList[i]->provider_id()), cardList[i]->id()), false, i); reorganizeCards(); } else if (!origZone->contentsKnown()) { @@ -88,8 +88,7 @@ void ZoneViewZone::initializeCards(const QList &cardLis int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size()); for (int i = 0; i < number; i++) { CardItem *card = c.at(i); - addCard(new CardItem(player, this, card->getName(), card->getProviderId(), card->getId(), revealZone), - false, i); + addCard(new CardItem(player, this, card->getName(), card->getProviderId(), card->getId()), false, i); } reorganizeCards(); } @@ -103,7 +102,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r) const ServerInfo_Card &cardInfo = resp.zone_info().card_list(i); auto cardName = QString::fromStdString(cardInfo.name()); auto cardProviderId = QString::fromStdString(cardInfo.provider_id()); - auto *card = new CardItem(player, this, cardName, cardProviderId, cardInfo.id(), revealZone, this); + auto *card = new CardItem(player, this, cardName, cardProviderId, cardInfo.id(), this); cards.insert(i, card); }