jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-09 15:54:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merge pull request #156 from arxanas/master

Browse source 
Fix #45: don't send tokens to deckstats.
This commit is contained in:
Gavin Bisesi 2014-07-23 08:41:15 -04:00
commit a50e7ba936
8 changed files with 108 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

36
cockatrice/src/carddatabase.cpp
View file

@ -684,42 +684,13 @@ CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &card
return 0;
}
LoadStatus CardDatabase::loadFromFile(const QString &fileName, bool tokens)
LoadStatus CardDatabase::loadFromFile(const QString &fileName)
{
QFile file(fileName);
file.open(QIODevice::ReadOnly);
if (!file.isOpen())
return FileError;
if (tokens) {
QMutableHashIterator<QString, CardInfo *> i(cards);
while (i.hasNext()) {
i.next();
if (i.value()->getIsToken()) {
removeCard(i.value());
delete i.value();
}
}
} else {
QHashIterator<QString, CardSet *> setIt(sets);
while (setIt.hasNext()) {
setIt.next();
delete setIt.value();
}
sets.clear();
QMutableHashIterator<QString, CardInfo *> i(cards);
while (i.hasNext()) {
i.next();
if (!i.value()->getIsToken()) {
removeCard(i.value());
delete i.value();
}
}
cards.clear();
simpleNameCards.clear();
}
QXmlStreamReader xml(&file);
while (!xml.atEnd()) {
if (xml.readNext() == QXmlStreamReader::StartElement) {
@ -771,8 +742,7 @@ bool CardDatabase::saveToFile(const QString &fileName, bool tokens)
QHashIterator<QString, CardInfo *> cardIterator(cards);
while (cardIterator.hasNext()) {
CardInfo *card = cardIterator.next().value();
if (card->getIsToken() == tokens)
xml << card;
xml << card;
}
xml.writeEndElement(); // cards
@ -806,7 +776,7 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path, bool tokens)
{
LoadStatus tempLoadStatus = NotLoaded;
if (!path.isEmpty())
tempLoadStatus = loadFromFile(path, tokens);
tempLoadStatus = loadFromFile(path);
if (tempLoadStatus == Ok) {
SetList allSets;