diff --git a/cockatrice/src/game/cards/card_item.cpp b/cockatrice/src/game/cards/card_item.cpp index f5785e16f..0378c1909 100644 --- a/cockatrice/src/game/cards/card_item.cpp +++ b/cockatrice/src/game/cards/card_item.cpp @@ -18,11 +18,11 @@ #include CardItem::CardItem(Player *_owner, + QGraphicsItem *parent, const QString &_name, const QString &_providerId, int _cardid, bool _revealedCard, - QGraphicsItem *parent, CardZone *_zone) : AbstractCardItem(parent, _name, _providerId, _owner, _cardid), zone(_zone), revealedCard(_revealedCard), attacking(false), destroyOnZoneChange(false), doesntUntap(false), dragItem(nullptr), attachedTo(nullptr) diff --git a/cockatrice/src/game/cards/card_item.h b/cockatrice/src/game/cards/card_item.h index 8b081d71b..bb037ead9 100644 --- a/cockatrice/src/game/cards/card_item.h +++ b/cockatrice/src/game/cards/card_item.h @@ -50,11 +50,11 @@ public: return Type; } CardItem(Player *_owner, + QGraphicsItem *parent = nullptr, const QString &_name = QString(), const QString &_providerId = QString(), int _cardid = -1, bool revealedCard = false, - QGraphicsItem *parent = nullptr, CardZone *_zone = nullptr); ~CardItem(); void retranslateUi(); diff --git a/cockatrice/src/game/player/player.cpp b/cockatrice/src/game/player/player.cpp index 1653e5f35..dd98305ff 100644 --- a/cockatrice/src/game/player/player.cpp +++ b/cockatrice/src/game/player/player.cpp @@ -2031,7 +2031,7 @@ void Player::eventCreateToken(const Event_CreateToken &event) return; } - CardItem *card = new CardItem(this, QString::fromStdString(event.card_name()), QString(), event.card_id()); + CardItem *card = new CardItem(this, nullptr, QString::fromStdString(event.card_name()), QString(), event.card_id()); // use db PT if not provided in event if (!QString::fromStdString(event.pt()).isEmpty()) { card->setPT(QString::fromStdString(event.pt())); diff --git a/cockatrice/src/game/zones/card_zone.cpp b/cockatrice/src/game/zones/card_zone.cpp index ab5027bdd..79bba9d65 100644 --- a/cockatrice/src/game/zones/card_zone.cpp +++ b/cockatrice/src/game/zones/card_zone.cpp @@ -126,7 +126,7 @@ void CardZone::addCard(CardItem *card, bool reorganize, int x, int y) { for (auto *view : views) { if ((x <= view->getCards().size()) || (view->getNumberCards() == -1)) { - view->addCard(new CardItem(player, card->getName(), card->getProviderId(), card->getId()), reorganize, x, y); + view->addCard(new CardItem(player, nullptr, card->getName(), card->getProviderId(), card->getId()), reorganize, x, y); } } diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index f0091aeae..6d4908179 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -56,9 +56,8 @@ void ZoneViewZone::initializeCards(const QList &cardLis { if (!cardList.isEmpty()) { for (int i = 0; i < cardList.size(); ++i) - addCard(new CardItem(player, QString::fromStdString(cardList[i]->name()), - QString::fromStdString(cardList[i]->provider_id()), cardList[i]->id(), revealZone, - this), + addCard(new CardItem(player, this, QString::fromStdString(cardList[i]->name()), + QString::fromStdString(cardList[i]->provider_id()), cardList[i]->id(), revealZone), false, i); reorganizeCards(); } else if (!origZone->contentsKnown()) { @@ -76,7 +75,8 @@ 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, card->getName(), card->getProviderId(), card->getId(), revealZone, this), false, i); + addCard(new CardItem(player, this, card->getName(), card->getProviderId(), card->getId(), revealZone), + false, i); } reorganizeCards(); } @@ -90,7 +90,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, cardName, cardProviderId, cardInfo.id(), revealZone, this, this); + auto *card = new CardItem(player, this, cardName, cardProviderId, cardInfo.id(), revealZone, this); cards.insert(i, card); } reorganizeCards();