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