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

Change parent to be the first argument.

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

12
cockatrice/src/deck/deck_view.cpp
View file

@ -68,11 +68,11 @@ void DeckViewCardDragItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
event->accept(); event->accept();
} }
DeckViewCard::DeckViewCard(const QString &_name, DeckViewCard::DeckViewCard(QGraphicsItem *parent,
const QString &_name,
const QString &_providerId, const QString &_providerId,
const QString &_originZone, const QString &_originZone)
QGraphicsItem *parent) : AbstractCardItem(parent, _name, _providerId, 0, -1), originZone(_originZone), dragItem(0)
: AbstractCardItem(_name, _providerId, 0, -1, parent), originZone(_originZone), dragItem(0)
{ {
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
} }
@ -357,8 +357,8 @@ void DeckViewScene::rebuildTree()
continue; continue;
for (int k = 0; k < currentCard->getNumber(); ++k) { for (int k = 0; k < currentCard->getNumber(); ++k) {
DeckViewCard *newCard = new DeckViewCard(currentCard->getName(), currentCard->getCardProviderId(), DeckViewCard *newCard = new DeckViewCard(container, currentCard->getName(),
currentZone->getName(), container); currentCard->getCardProviderId(), currentZone->getName());
container->addCard(newCard); container->addCard(newCard);
emit newCardAdded(newCard); emit newCardAdded(newCard);
} }

6
cockatrice/src/deck/deck_view.h
View file

@ -24,10 +24,10 @@ private:
DeckViewCardDragItem *dragItem; DeckViewCardDragItem *dragItem;
public: public:
DeckViewCard(const QString &_name = QString(), DeckViewCard(QGraphicsItem *parent = nullptr,
const QString &_name = QString(),
const QString &_providerId = QString(), const QString &_providerId = QString(),
const QString &_originZone = QString(), const QString &_originZone = QString());
QGraphicsItem *parent = nullptr);
~DeckViewCard(); ~DeckViewCard();
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
const QString &getOriginZone() const const QString &getOriginZone() const

10
cockatrice/src/game/cards/abstract_card_item.cpp
View file

@ -12,13 +12,13 @@
#include <QPainter> #include <QPainter>
#include <algorithm> #include <algorithm>
AbstractCardItem::AbstractCardItem(const QString &_name, AbstractCardItem::AbstractCardItem(QGraphicsItem *parent,
const QString &_name,
const QString &_providerId, const QString &_providerId,
Player *_owner, Player *_owner,
int _id, int _id)
QGraphicsItem *parent) : ArrowTarget(_owner, parent), id(_id), name(_name), providerId(_providerId), tapped(false), facedown(false),
: ArrowTarget(_owner, parent), id(_id), name(_name), providerId(_providerId), tapped(false), facedown(false), tapAngle(0), tapAngle(0), bgColor(Qt::transparent), isHovered(false), realZValue(0)
bgColor(Qt::transparent), isHovered(false), realZValue(0)
{ {
setCursor(Qt::OpenHandCursor); setCursor(Qt::OpenHandCursor);
setFlag(ItemIsSelectable); setFlag(ItemIsSelectable);

6
cockatrice/src/game/cards/abstract_card_item.h
View file

@ -49,11 +49,11 @@ public:
{ {
return Type; return Type;
} }
AbstractCardItem(const QString &_name = QString(), AbstractCardItem(QGraphicsItem *parent = nullptr,
const QString &_name = QString(),
const QString &_providerId = QString(), const QString &_providerId = QString(),
Player *_owner = nullptr, Player *_owner = nullptr,
int _id = -1, int _id = -1);
QGraphicsItem *parent = nullptr);
~AbstractCardItem(); ~AbstractCardItem();
QRectF boundingRect() const override; QRectF boundingRect() const override;
QPainterPath shape() const override; QPainterPath shape() const override;

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

@ -24,7 +24,7 @@ CardItem::CardItem(Player *_owner,
bool _revealedCard, bool _revealedCard,
QGraphicsItem *parent, QGraphicsItem *parent,
CardZone *_zone) CardZone *_zone)
: AbstractCardItem(_name, _providerId, _owner, _cardid, parent), 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)
{ {
owner->addCard(this); owner->addCard(this);