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

fixes after rebase

Browse source
This commit is contained in:
RickyRister 2025-12-13 20:40:54 -08:00
parent 2c24ff9c04
commit bb084a18ec
5 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
View file

@ -556,9 +556,11 @@ DecklistCardNode *DeckList::addCard(const QString &cardName,
int position, int position,
const QString &cardSetName, const QString &cardSetName,
const QString &cardSetCollectorNumber, const QString &cardSetCollectorNumber,
const QString &cardProviderId) const QString &cardProviderId,
bool formatLegal)
{ {
auto node = tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId); auto node =
tree.addCard(cardName, 1, zoneName, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal);
refreshDeckHash(); refreshDeckHash();
return node; return node;
} }

3
libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
View file

@ -293,7 +293,8 @@ public:
int position = -1, int position = -1,
const QString &cardSetName = QString(), const QString &cardSetName = QString(),
const QString &cardSetCollectorNumber = QString(), const QString &cardSetCollectorNumber = QString(),
const QString &cardProviderId = QString()); const QString &cardProviderId = QString(),
const bool formatLegal = true);
///@} ///@}
/// @name Deck identity /// @name Deck identity

7
libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp
View file

@ -115,11 +115,12 @@ DecklistCardNode *DecklistNodeTree::addCard(const QString &cardName,
int position, int position,
const QString &cardSetName, const QString &cardSetName,
const QString &cardSetCollectorNumber, const QString &cardSetCollectorNumber,
const QString &cardProviderId) const QString &cardProviderId,
const bool formatLegal)
{ {
auto *zoneNode = getZoneObjFromName(zoneName); auto *zoneNode = getZoneObjFromName(zoneName);
auto *node = auto *node = new DecklistCardNode(cardName, amount, zoneNode, position, cardSetName, cardSetCollectorNumber,
new DecklistCardNode(cardName, amount, zoneNode, position, cardSetName, cardSetCollectorNumber, cardProviderId); cardProviderId, formatLegal);
return node; return node;
} }

3
libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h
View file

@ -68,7 +68,8 @@ public:
int position, int position,
const QString &cardSetName = QString(), const QString &cardSetName = QString(),
const QString &cardSetCollectorNumber = QString(), const QString &cardSetCollectorNumber = QString(),
const QString &cardProviderId = QString()); const QString &cardProviderId = QString(),
const bool formatLegal = true);
bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr); bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr);
/** /**

2
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
View file

@ -668,7 +668,7 @@ bool DeckListModel::isCardQuantityLegalForCurrentFormat(const CardInfoPtr cardIn
void DeckListModel::refreshCardFormatLegalities() void DeckListModel::refreshCardFormatLegalities()
{ {
InnerDecklistNode *listRoot = deckList->getRoot(); InnerDecklistNode *listRoot = deckList->getTree()->getRoot();
for (int i = 0; i < listRoot->size(); i++) { for (int i = 0; i < listRoot->size(); i++) {
auto *currentZone = static_cast<InnerDecklistNode *>(listRoot->at(i)); auto *currentZone = static_cast<InnerDecklistNode *>(listRoot->at(i));