jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 03:28:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: find by prefix if card not found only

Browse source
This commit is contained in:
Mawu3n4 2014-08-07 17:43:14 +02:00
parent 9092f2298b
commit 10ab53c4ac
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/carddatabase.cpp
View file

@ -719,7 +719,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml)
CardInfo *CardNameMap::findByPrefix(const std::string &prefix) { CardInfo *CardNameMap::findByPrefix(const std::string &prefix) {
for (CardNameMap::iterator it = this->begin(); it != this->end(); ++it) { for (CardNameMap::iterator it = this->begin(); it != this->end(); ++it) {
if (std::mismatch(prefix.begin(), prefix.end(), if (std::mismatch(prefix.begin(), prefix.end(),
it.key().toStdString().begin()).first == prefix.end()) it.key().toStdString().begin()).first == prefix.end())
return it.value(); return it.value();
} }
@ -731,6 +731,8 @@ CardInfo *CardDatabase::getCardFromMap(CardNameMap &cardMap, const QString &card
if (cardName.isEmpty()) if (cardName.isEmpty())
return noCard; return noCard;
else if (cardMap.contains(cardName))
return cardMap.value(cardName);
else if ((foundCard = cardMap.findByPrefix(cardName.toStdString()))) else if ((foundCard = cardMap.findByPrefix(cardName.toStdString())))
return foundCard; return foundCard;
else if (createIfNotFound) { else if (createIfNotFound) {