jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-23 10:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pull Parent argument up for CardItem.

Browse source
This commit is contained in:
Lukas Brübach 2024-11-19 03:36:24 +01:00
parent 750b75a3d4
commit ddd1bd57c3
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/game/cards/card_item.cpp
View file

@ -18,11 +18,11 @@
#include <QPainter> #include <QPainter>
CardItem::CardItem(Player *_owner, CardItem::CardItem(Player *_owner,
QGraphicsItem *parent,
const QString &_name, const QString &_name,
const QString &_providerId, const QString &_providerId,
int _cardid, int _cardid,
bool _revealedCard, bool _revealedCard,
QGraphicsItem *parent,
CardZone *_zone) CardZone *_zone)
: AbstractCardItem(parent, _name, _providerId, _owner, _cardid), zone(_zone), revealedCard(_revealedCard), : AbstractCardItem(parent, _name, _providerId, _owner, _cardid), zone(_zone), revealedCard(_revealedCard),
attacking(false), destroyOnZoneChange(false), doesntUntap(false), dragItem(nullptr), attachedTo(nullptr) attacking(false), destroyOnZoneChange(false), doesntUntap(false), dragItem(nullptr), attachedTo(nullptr)

2
cockatrice/src/game/cards/card_item.h
View file

@ -50,11 +50,11 @@ public:
return Type; return Type;
} }
CardItem(Player *_owner, CardItem(Player *_owner,
QGraphicsItem *parent = nullptr,
const QString &_name = QString(), const QString &_name = QString(),
const QString &_providerId = QString(), const QString &_providerId = QString(),
int _cardid = -1, int _cardid = -1,
bool revealedCard = false, bool revealedCard = false,
QGraphicsItem *parent = nullptr,
CardZone *_zone = nullptr); CardZone *_zone = nullptr);
~CardItem(); ~CardItem();
void retranslateUi(); void retranslateUi();

2
cockatrice/src/game/player/player.cpp
View file

@ -2031,7 +2031,7 @@ void Player::eventCreateToken(const Event_CreateToken &event)
return; 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 // use db PT if not provided in event
if (!QString::fromStdString(event.pt()).isEmpty()) { if (!QString::fromStdString(event.pt()).isEmpty()) {
card->setPT(QString::fromStdString(event.pt())); card->setPT(QString::fromStdString(event.pt()));

2
cockatrice/src/game/zones/card_zone.cpp
View file

@ -126,7 +126,7 @@ void CardZone::addCard(CardItem *card, bool reorganize, int x, int y)
{ {
for (auto *view : views) { for (auto *view : views) {
if ((x <= view->getCards().size()) || (view->getNumberCards() == -1)) { 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);
} }
} }

10
cockatrice/src/game/zones/view_zone.cpp
View file

@ -56,9 +56,8 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
{ {
if (!cardList.isEmpty()) { if (!cardList.isEmpty()) {
for (int i = 0; i < cardList.size(); ++i) for (int i = 0; i < cardList.size(); ++i)
addCard(new CardItem(player, QString::fromStdString(cardList[i]->name()), 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(), revealZone),
this),
false, i); false, i);
reorganizeCards(); reorganizeCards();
} else if (!origZone->contentsKnown()) { } else if (!origZone->contentsKnown()) {
@ -76,7 +75,8 @@ void ZoneViewZone::initializeCards(const QList<const ServerInfo_Card *> &cardLis
int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size()); int number = numberCards == -1 ? c.size() : (numberCards < c.size() ? numberCards : c.size());
for (int i = 0; i < number; i++) { for (int i = 0; i < number; i++) {
CardItem *card = c.at(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(); reorganizeCards();
} }
@ -90,7 +90,7 @@ void ZoneViewZone::zoneDumpReceived(const Response &r)
const ServerInfo_Card &cardInfo = resp.zone_info().card_list(i); const ServerInfo_Card &cardInfo = resp.zone_info().card_list(i);
auto cardName = QString::fromStdString(cardInfo.name()); auto cardName = QString::fromStdString(cardInfo.name());
auto cardProviderId = QString::fromStdString(cardInfo.provider_id()); 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); cards.insert(i, card);
} }
reorganizeCards(); reorganizeCards();