From aff32e0f567a7e07664bf3e31c6a06506d2ffeaf Mon Sep 17 00:00:00 2001 From: Waleed Khan Date: Sun, 20 Jul 2014 21:09:58 -0400 Subject: [PATCH] Ignore diacritics as well. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card]. Also I removed some debugging information I accidentally left in. --- cockatrice/src/carddatabase.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index c55148aa..5083e6ed 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -436,6 +436,10 @@ int CardInfo::getPreferredMuId() QString CardInfo::simplifyName(const QString &name) { QString simpleName(name); + + // Replace Jötun Grunt with Jotun Grunt. + simpleName = simpleName.normalized(QString::NormalizationForm_KD); + simpleName.remove(QRegExp("[^a-zA-Z0-9 ]")); simpleName = simpleName.toLower(); return simpleName; @@ -553,8 +557,6 @@ CardInfo *CardDatabase::getCard(const QString &cardName, bool createIfNotFound) CardInfo *CardDatabase::getCardBySimpleName(const QString &cardName, bool createIfNotFound) { QString simpleName = CardInfo::simplifyName(cardName); - qDebug() << "Getting card by name " << simpleName << "\n"; - qDebug() << "Cards available: " << simpleNameCards.size() << "\n"; return getCardFromMap(simpleNameCards, simpleName, createIfNotFound); }