jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 16:32:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use getCardInfo

Browse source 
Took 9 minutes
This commit is contained in:
Lukas Brübach 2025-09-11 12:40:28 +02:00
parent a9234f39ed
commit 3d1e525bdd
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/game/cards/card_database.cpp
View file

@ -217,12 +217,12 @@ ExactCard CardDatabase::guessCard(const CardRef &cardRef) const
ExactCard CardDatabase::getRandomCard() ExactCard CardDatabase::getRandomCard()
{ {
if (cards.isEmpty()) if (cards.isEmpty())
return ExactCard(); return {};
const auto keys = cards.keys(); const auto keys = cards.keys();
int randomIndex = QRandomGenerator::global()->bounded(keys.size()); int randomIndex = QRandomGenerator::global()->bounded(keys.size());
const QString &randomKey = keys.at(randomIndex); const QString &randomKey = keys.at(randomIndex);
CardInfoPtr randomCard = getCardFromMap(cards, randomKey); CardInfoPtr randomCard = getCardInfo(randomKey);
return ExactCard{randomCard, getPreferredPrinting(randomCard)}; return ExactCard{randomCard, getPreferredPrinting(randomCard)};
} }
@ -252,14 +252,6 @@ SetList CardDatabase::getSetList() const
return result; return result;
} }
CardInfoPtr CardDatabase::getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const
{
if (cardMap.contains(cardName))
return cardMap.value(cardName);
return {};
}
LoadStatus CardDatabase::loadFromFile(const QString &fileName) LoadStatus CardDatabase::loadFromFile(const QString &fileName)
{ {
QFile file(fileName); QFile file(fileName);