aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix related cards popup (#3613)

Browse source
This commit is contained in:
Rob Blanckaert 2019-03-03 23:19:37 -08:00 committed by Zach H
parent 440311c939
commit 55c4207182
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/carddatabase.h
View file

@ -287,6 +287,13 @@ public:
{ {
return reverseRelatedCardsToMe; return reverseRelatedCardsToMe;
} }
const QList<CardRelation *> getAllRelatedCards() const
{
QList<CardRelation *> result;
result.append(getRelatedCards());
result.append(getReverseRelatedCards2Me());
return result;
}
void resetReverseRelatedCards2Me(); void resetReverseRelatedCards2Me();
void addReverseRelatedCards2Me(CardRelation *cardRelation) void addReverseRelatedCards2Me(CardRelation *cardRelation)
{ {

4
cockatrice/src/player.cpp
View file

@ -3065,7 +3065,7 @@ void Player::addRelatedCardView(const CardItem *card, QMenu *cardMenu)
return; return;
} }
QList<CardRelation *> relatedCards = cardInfo->getRelatedCards(); QList<CardRelation *> relatedCards = cardInfo->getAllRelatedCards();
if (relatedCards.isEmpty()) { if (relatedCards.isEmpty()) {
return; return;
} }
@ -3092,7 +3092,7 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu)
return; return;
} }
QList<CardRelation *> relatedCards = cardInfo->getRelatedCards(); QList<CardRelation *> relatedCards = cardInfo->getAllRelatedCards();
if (relatedCards.isEmpty()) { if (relatedCards.isEmpty()) {
return; return;
} }