jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Have CardDatabase::getPreferredPrintingInfo respect card provider ID overrides (pinned printings)

Browse source 
Took 13 minutes

Took 37 seconds


Took 10 seconds

Took 10 seconds
This commit is contained in:
Lukas Brübach 2025-09-14 15:45:26 +02:00
parent 2a032f3116
commit 6fa1dcbe1d
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/game/dialogs/dlg_create_token.cpp
View file

@ -199,16 +199,7 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
annotationEdit->setText(""); annotationEdit->setText("");
} }
const auto &cardProviderId = pic->setCard(CardDatabaseManager::getInstance()->getPreferredCard(cardInfo));
SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardInfo->getName());
if (!cardProviderId.isEmpty()) {
CardRef ref;
ref.name = cardInfo->getName();
ref.providerId = cardProviderId;
pic->setCard(CardDatabaseManager::query()->getCard(ref));
} else {
pic->setCard(CardDatabaseManager::query()->getPreferredCard(cardInfo));
}
} }
void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const

1
cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h
View file

@ -24,7 +24,6 @@ public:
public slots: public slots:
ExactCard currentCard() const; ExactCard currentCard() const;
ExactCard getCardOrPinnedPrinting(QString cardName) const;
void setFilterTree(FilterTree *filterTree); void setFilterTree(FilterTree *filterTree);
void clearAllDatabaseFilters(); void clearAllDatabaseFilters();