From 35f36364e9c43ae0f2a59b79f5d04d27d852e269 Mon Sep 17 00:00:00 2001 From: Cameron McDonald Date: Thu, 21 Nov 2024 17:10:05 -0600 Subject: [PATCH] remove PriorityUndefined and set PriorityFallback to 0 --- cockatrice/src/game/cards/card_database.h | 7 +++---- .../game/cards/card_database_parser/card_database_parser.h | 2 +- oracle/src/oracleimporter.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index a29a52c14..6f73f16a4 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -32,8 +32,7 @@ class CardSet : public QList public: enum Priority { - PriorityUndefined = 0, - PriorityFallback = 1, + PriorityFallback = 0, PriorityPrimary = 10, PrioritySecondary = 20, PriorityReprint = 30, @@ -54,12 +53,12 @@ public: const QString &_longName = QString(), const QString &_setType = QString(), const QDate &_releaseDate = QDate(), - const Priority _priority = PriorityUndefined); + const Priority _priority = PriorityFallback); static CardSetPtr newInstance(const QString &_shortName = QString(), const QString &_longName = QString(), const QString &_setType = QString(), const QDate &_releaseDate = QDate(), - const Priority _priority = PriorityUndefined); + const Priority _priority = PriorityFallback); QString getCorrectedShortName() const; QString getShortName() const { diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h index 8d72b743b..87e8eec5e 100644 --- a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h +++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h @@ -33,7 +33,7 @@ protected: const QString &longName = "", const QString &setType = "", const QDate &releaseDate = QDate(), - const CardSet::Priority priority = CardSet::PriorityUndefined); + const CardSet::Priority priority = CardSet::PriorityFallback); signals: virtual void addCard(CardInfoPtr card) = 0; virtual void addSet(CardSetPtr set) = 0; diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index fe7da4721..a511831c8 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -24,7 +24,7 @@ CardSet::Priority OracleImporter::getSetPriority(QString &setType, QString &shor if (!setTypePriorities.contains(setType.toLower())) { qDebug() << "warning: Set type" << setType << "unrecognized for prioritization"; } - CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::PriorityUndefined); + CardSet::Priority priority = setTypePriorities.value(setType.toLower(), CardSet::PriorityFallback); if (nonEnglishSets.contains(shortName)) { priority = CardSet::PriorityLowest; }