From 62d0a61717e9389874b5094bfadcb8c1a14989ee Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 30 Mar 2015 11:56:08 +0200 Subject: [PATCH] Set cmc to 0 if not set; fix #669 --- oracle/src/oracleimporter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 5f591b4f..56bdb9f5 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -192,7 +192,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) // add first card's data cardName = card1->contains("name") ? card1->value("name").toString() : QString(""); cardCost = card1->contains("manaCost") ? card1->value("manaCost").toString() : QString(""); - cmc = card1->contains("cmc") ? card1->value("cmc").toString() : QString(""); + cmc = card1->contains("cmc") ? card1->value("cmc").toString() : QString("0"); cardType = card1->contains("type") ? card1->value("type").toString() : QString(""); cardPT = card1->contains("power") || card1->contains("toughness") ? card1->value("power").toString() + QString('/') + card1->value("toughness").toString() : QString(""); cardText = card1->contains("text") ? card1->value("text").toString() : QString(""); @@ -200,7 +200,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) // add second card's data cardName += card2->contains("name") ? QString(" // ") + card2->value("name").toString() : QString(""); cardCost += card2->contains("manaCost") ? QString(" // ") + card2->value("manaCost").toString() : QString(""); - cmc += card2->contains("cmc") ? QString(" // ") + card2->value("cmc").toString() : QString(""); + cmc += card2->contains("cmc") ? QString(" // ") + card2->value("cmc").toString() : QString("0"); cardType += card2->contains("type") ? QString(" // ") + card2->value("type").toString() : QString(""); cardPT += card2->contains("power") || card2->contains("toughness") ? QString(" // ") + card2->value("power").toString() + QString('/') + card2->value("toughness").toString() : QString(""); cardText += card2->contains("text") ? QString("\n\n---\n\n") + card2->value("text").toString() : QString(""); @@ -221,7 +221,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data) // normal cards handling cardName = map.contains("name") ? map.value("name").toString() : QString(""); cardCost = map.contains("manaCost") ? map.value("manaCost").toString() : QString(""); - cmc = map.contains("cmc") ? map.value("cmc").toString() : QString(""); + cmc = map.contains("cmc") ? map.value("cmc").toString() : QString("0"); cardType = map.contains("type") ? map.value("type").toString() : QString(""); cardPT = map.contains("power") || map.contains("toughness") ? map.value("power").toString() + QString('/') + map.value("toughness").toString() : QString(""); cardText = map.contains("text") ? map.value("text").toString() : QString("");