From 55c4207182a2a99965f22b4df4ee5d45dc163175 Mon Sep 17 00:00:00 2001 From: Rob Blanckaert Date: Sun, 3 Mar 2019 23:19:37 -0800 Subject: [PATCH] Fix related cards popup (#3613) --- cockatrice/src/carddatabase.h | 7 +++++++ cockatrice/src/player.cpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/carddatabase.h b/cockatrice/src/carddatabase.h index 9d137179..0390973e 100644 --- a/cockatrice/src/carddatabase.h +++ b/cockatrice/src/carddatabase.h @@ -287,6 +287,13 @@ public: { return reverseRelatedCardsToMe; } + const QList getAllRelatedCards() const + { + QList result; + result.append(getRelatedCards()); + result.append(getReverseRelatedCards2Me()); + return result; + } void resetReverseRelatedCards2Me(); void addReverseRelatedCards2Me(CardRelation *cardRelation) { diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 60e28d27..232ba031 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -3065,7 +3065,7 @@ void Player::addRelatedCardView(const CardItem *card, QMenu *cardMenu) return; } - QList relatedCards = cardInfo->getRelatedCards(); + QList relatedCards = cardInfo->getAllRelatedCards(); if (relatedCards.isEmpty()) { return; } @@ -3092,7 +3092,7 @@ void Player::addRelatedCardActions(const CardItem *card, QMenu *cardMenu) return; } - QList relatedCards = cardInfo->getRelatedCards(); + QList relatedCards = cardInfo->getAllRelatedCards(); if (relatedCards.isEmpty()) { return; }