gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-23 15:37:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

Better handle the TK set used for tokens

Browse Source 
Let oracle add a basic TK set in cards.xml
Unify all the code previously using the string literal “TK”
This commit is contained in:
Fabio Bas
2014-11-19 19:44:54 +01:00
parent 8542d875d3
commit ac43fa23b9
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cockatrice/src/carddatabase.cpp
View File

@@ -16,6 +16,7 @@
#include <QImageReader> #include <QImageReader>
const int CardDatabase::versionNeeded = 3; const int CardDatabase::versionNeeded = 3;
const char* CardDatabase::TOKENS_SETNAME = "TK";
static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSet *set) static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSet *set)
{ {
@@ -791,7 +792,7 @@ CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &card
return cardMap.value(cardName); return cardMap.value(cardName);
else if (createIfNotFound) { else if (createIfNotFound) {
CardInfo *newCard = new CardInfo(this, cardName, true); CardInfo *newCard = new CardInfo(this, cardName, true);
newCard->addToSet(getSet("TK")); newCard->addToSet(getSet(CardDatabase::TOKENS_SETNAME));
cardMap.insert(cardName, newCard); cardMap.insert(cardName, newCard);
return newCard; return newCard;
} else } else

2
cockatrice/src/carddatabase.h
View File

@@ -218,6 +218,8 @@ private:
CardInfo *getCardFromMap(CardNameMap &cardMap, const QString &cardName, bool createIfNotFound); CardInfo *getCardFromMap(CardNameMap &cardMap, const QString &cardName, bool createIfNotFound);
public: public:
static const char* TOKENS_SETNAME;
CardDatabase(QObject *parent = 0); CardDatabase(QObject *parent = 0);
~CardDatabase(); ~CardDatabase();
void clear(); void clear();

2
cockatrice/src/dlg_edit_tokens.cpp
View File

@@ -146,7 +146,7 @@ void DlgEditTokens::actAddToken()
return; return;
CardInfo *card = new CardInfo(cardDatabaseModel->getDatabase(), name, true); CardInfo *card = new CardInfo(cardDatabaseModel->getDatabase(), name, true);
card->addToSet(cardDatabaseModel->getDatabase()->getSet("TK")); card->addToSet(cardDatabaseModel->getDatabase()->getSet(CardDatabase::TOKENS_SETNAME));
card->setCardType("Token"); card->setCardType("Token");
cardDatabaseModel->getDatabase()->addCard(card); cardDatabaseModel->getDatabase()->addCard(card);
} }

4
oracle/src/oracleimporter.cpp
View File

@@ -235,6 +235,10 @@ int OracleImporter::startImport()
QListIterator<SetToDownload> it(allSets); QListIterator<SetToDownload> it(allSets);
const SetToDownload * curSet; const SetToDownload * curSet;
// add an empty set for tokens
CardSet *tokenSet = new CardSet(TOKENS_SETNAME, tr("Dummy set containing tokens"), "tokens");
sets.insert(TOKENS_SETNAME, tokenSet);
while (it.hasNext()) while (it.hasNext())
{ {
curSet = & it.next(); curSet = & it.next();