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

Reintroduce some changes lost in the merge.

Browse source
This commit is contained in:
Lukas Brübach 2024-11-06 09:31:44 +01:00
parent 502c901c06
commit c6a7b17d22
3 changed files with 55 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/game/cards/card_database.cpp
View file

@ -444,6 +444,10 @@ QList<CardInfoPtr> CardDatabase::getCards(const QStringList &cardNames) const
CardInfoPtr CardDatabase::getCardByNameAndUUID(const QString &cardName, const QString &uuid) const
{
auto info = getCard(cardName);
if (uuid.isNull() || uuid.isEmpty()) {
return info;
}
for (const auto &set : info->getSets()) {
if (set.getProperty("uuid") == uuid) {
CardInfoPtr cardFromSpecificSet = info->clone();

4
cockatrice/src/game/cards/card_database.h
View file

@ -414,8 +414,6 @@ protected:
private:
CardInfoPtr getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const;
void checkUnknownSets();
CardInfoPerSet getPreferredSetForCard(const QString &cardName);
QString getPreferredPrintingUUIDForCard(const QString &cardName);
void refreshCachedReverseRelatedCards();
QBasicMutex *reloadDatabaseMutex = new QBasicMutex(), *clearDatabaseMutex = new QBasicMutex(),
@ -432,6 +430,8 @@ public:
CardInfoPtr getCard(const QString &cardName) const;
QList<CardInfoPtr> getCards(const QStringList &cardNames) const;
CardInfoPtr getCardByNameAndUUID(const QString &cardName, const QString &uuid) const;
CardInfoPerSet getPreferredSetForCard(const QString &cardName);
QString getPreferredPrintingUUIDForCard(const QString &cardName);
CardInfoPtr guessCard(const QString &cardName) const;
/*