jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-29 01:53:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Keep card annotations on stack (#5399)

Browse source
This commit is contained in:
Zach H 2024-12-31 14:08:25 -05:00 • committed by GitHub
parent b2a8748bc6
commit 6e1047032d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -217,13 +217,15 @@ void CardItem::setAttachedTo(CardItem *_attachedTo)
}
}
void CardItem::resetState()
void CardItem::resetState(bool keepAnnotations)
{
attacking = false;
facedown = false;
counters.clear();
pt.clear();
annotation.clear();
if (!keepAnnotations) {
annotation.clear();
}
attachedTo = 0;
attachedCards.clear();
setTapped(false, false);

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

@ -139,7 +139,7 @@ public:
{
return attachedCards;
}
void resetState();
void resetState(bool keepAnnotations = false);
void processCardInfo(const ServerInfo_Card &_info);
QMenu *getCardMenu() const

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

@ -37,7 +37,7 @@ void StackZone::addCardImpl(CardItem *card, int x, int /*y*/)
card->setName();
}
card->setParentItem(this);
card->resetState();
card->resetState(true);
card->setVisible(true);
card->update();
}