jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	cockatrice/src/carddatabase.cpp
This commit is contained in:
Waleed Khan 2014-07-23 00:49:13 -04:00
commit 40e97140d6
5 changed files with 121 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
oracle/src/oracleimporter.cpp
View file

@ -80,8 +80,8 @@ CardInfo *OracleImporter::addCard(const QString &setName,
cardCost.remove(QChar('}'));
CardInfo *card;
if (cardHash.contains(cardName)) {
card = cardHash.value(cardName);
if (cards.contains(cardName)) {
card = cards.value(cardName);
if (splitCard && !card->getText().contains(fullCardText))
card->setText(card->getText() + "\n---\n" + fullCardText);
} else {
@ -121,7 +121,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
tableRow = 2;
card->setTableRow(tableRow);
cardHash.insert(cardName, card);
cards.insert(cardName, card);
}
card->setMuId(setName, cardId);
@ -236,8 +236,8 @@ int OracleImporter::startImport()
continue;
CardSet *set = new CardSet(curSet->getShortName(), curSet->getLongName());
if (!setHash.contains(set->getShortName()))
setHash.insert(set->getShortName(), set);
if (!sets.contains(set->getShortName()))
sets.insert(set->getShortName(), set);
int setCards = importTextSpoiler(set, curSet->getCards());