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

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

2
cockatrice/src/carddatabase.h
View file

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

2
cockatrice/src/dlg_edit_tokens.cpp
View file

@ -146,7 +146,7 @@ void DlgEditTokens::actAddToken()
return;
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");
cardDatabaseModel->getDatabase()->addCard(card);
}