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

Merge pull request #238 from arxanas/no-overwrite-tokens-xml

Browse source 
Fix #231: tokens.xml no longer overwritten by cards.xml.
This commit is contained in:
Gavin Bisesi 2014-10-06 11:34:58 -04:00
commit 006451f402
3 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/carddatabase.h
View file

@ -208,7 +208,7 @@ protected:
LoadStatus loadStatus;
private:
static const int versionNeeded;
void loadCardsFromXml(QXmlStreamReader &xml);
void loadCardsFromXml(QXmlStreamReader &xml, bool tokens);
void loadSetsFromXml(QXmlStreamReader &xml);
CardInfo *getCardFromMap(CardNameMap &cardMap, const QString &cardName, bool createIfNotFound);
@ -229,7 +229,7 @@ public:
CardSet *getSet(const QString &setName);
QList<CardInfo *> getCardList() const { return cards.values(); }
SetList getSetList() const;
LoadStatus loadFromFile(const QString &fileName);
LoadStatus loadFromFile(const QString &fileName, bool tokens = false);
bool saveToFile(const QString &fileName, bool tokens = false);
QStringList getAllColors() const;
QStringList getAllMainCardTypes() const;