diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 50b3a20dc..a95190a9a 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -18,6 +18,7 @@ set(oracle_SOURCES src/parsehelpers.cpp src/qt-json/json.cpp ../cockatrice/src/card/card_info.cpp + ../cockatrice/src/card/card_relation.cpp ../cockatrice/src/client/network/release_channel.cpp ../cockatrice/src/database/parser/card_database_parser.cpp ../cockatrice/src/database/parser/cockatrice_xml_3.cpp diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 91137e634..598306f00 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -1,5 +1,6 @@ #include "oracleimporter.h" +#include #include "database/parser/cockatrice_xml_4.h" #include "parsehelpers.h" #include "qt-json/json.h" @@ -7,6 +8,7 @@ #include #include #include +#include #include SplitCardPart::SplitCardPart(const QString &_name, @@ -379,12 +381,12 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList static const QRegularExpression meldNameRegex{"then meld them into ([^\\.]*)"}; QString additionalName = meldNameRegex.match(text).captured(1); if (!additionalName.isNull()) { - relatedCards.append(new CardRelation(additionalName, CardRelation::TransformInto)); + relatedCards.append(new CardRelation(additionalName, CardRelationType::TransformInto)); } } else { for (const QString &additionalName : name.split(" // ")) { if (additionalName != faceName) { - relatedCards.append(new CardRelation(additionalName, CardRelation::TransformInto)); + relatedCards.append(new CardRelation(additionalName, CardRelationType::TransformInto)); } } } @@ -399,7 +401,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList auto spbk = givenRelated.value("spellbook").toStringList(); for (const QString &spbkName : spbk) { relatedCards.append( - new CardRelation(spbkName, CardRelation::DoesNotAttach, false, false, 1, true)); + new CardRelation(spbkName, CardRelationType::DoesNotAttach, false, false, 1, true)); } } }