mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-29 01:53:54 -07:00
Compare commits
No commits in common. "0f3e6fbe2605c896c628cf55c35f6629e678d612" and "f28ede7ae36916bf2bc5248fc46eed9ca44c5edb" have entirely different histories.
0f3e6fbe26
...
f28ede7ae3
3 changed files with 10 additions and 11 deletions
|
|
@ -882,8 +882,7 @@ void PlayerActions::actCreateToken(TokenInfo tokenToCreate)
|
|||
ExactCard correctedCard = CardDatabaseManager::query()->guessCard({lastTokenInfo.name, lastTokenInfo.providerId});
|
||||
if (correctedCard) {
|
||||
lastTokenInfo.name = correctedCard.getName();
|
||||
int tableRow = lastTokenInfo.faceDown ? 2 : correctedCard.getInfo().getUiAttributes().tableRow;
|
||||
lastTokenTableRow = TableZone::tableRowToGridY(tableRow);
|
||||
lastTokenTableRow = TableZone::tableRowToGridY(correctedCard.getInfo().getUiAttributes().tableRow);
|
||||
if (lastTokenInfo.pt.isEmpty()) {
|
||||
lastTokenInfo.pt = correctedCard.getInfo().getPowTough();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ void CardDatabase::refreshCachedReverseRelatedCards()
|
|||
}
|
||||
}
|
||||
|
||||
void CardDatabase::addCard(const CardInfoPtr &card)
|
||||
void CardDatabase::addCard(CardInfoPtr card)
|
||||
{
|
||||
if (card == nullptr) {
|
||||
qCWarning(CardDatabaseLog) << "CardDatabase::addCard(nullptr)";
|
||||
|
|
@ -118,7 +118,7 @@ void CardDatabase::addCard(const CardInfoPtr &card)
|
|||
emit cardAdded(card);
|
||||
}
|
||||
|
||||
void CardDatabase::removeCard(const CardInfoPtr &card)
|
||||
void CardDatabase::removeCard(CardInfoPtr card)
|
||||
{
|
||||
if (card.isNull()) {
|
||||
qCWarning(CardDatabaseLog) << "CardDatabase::removeCard(nullptr)";
|
||||
|
|
@ -143,7 +143,7 @@ void CardDatabase::removeCard(const CardInfoPtr &card)
|
|||
emit cardRemoved(card);
|
||||
}
|
||||
|
||||
void CardDatabase::addSet(const CardSetPtr &set)
|
||||
void CardDatabase::addSet(CardSetPtr set)
|
||||
{
|
||||
sets.insert(set->getShortName(), set);
|
||||
}
|
||||
|
|
@ -215,7 +215,7 @@ void CardDatabase::notifyEnabledSetsChanged()
|
|||
emit cardDatabaseEnabledSetsChanged();
|
||||
}
|
||||
|
||||
void CardDatabase::addFormat(const FormatRulesPtr &format)
|
||||
void CardDatabase::addFormat(FormatRulesPtr format)
|
||||
{
|
||||
formats.insert(format->formatName.toLower(), format);
|
||||
}
|
||||
}
|
||||
|
|
@ -88,7 +88,7 @@ public:
|
|||
* @brief Removes a card from the database.
|
||||
* @param card Pointer to the card to remove.
|
||||
*/
|
||||
void removeCard(const CardInfoPtr &card);
|
||||
void removeCard(CardInfoPtr card);
|
||||
|
||||
/** @brief Clears all cards, sets, and internal state. */
|
||||
void clear();
|
||||
|
|
@ -140,15 +140,15 @@ public slots:
|
|||
* @brief Adds a card to the database.
|
||||
* @param card CardInfoPtr to add.
|
||||
*/
|
||||
void addCard(const CardInfoPtr &card);
|
||||
void addCard(CardInfoPtr card);
|
||||
|
||||
/**
|
||||
* @brief Adds a set to the database.
|
||||
* @param set Pointer to CardSet to add.
|
||||
*/
|
||||
void addSet(const CardSetPtr &set);
|
||||
void addSet(CardSetPtr set);
|
||||
|
||||
void addFormat(const FormatRulesPtr &format);
|
||||
void addFormat(FormatRulesPtr format);
|
||||
|
||||
/** @brief Loads card databases from configured paths. */
|
||||
void loadCardDatabases();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue