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

Fix #105 - remove emdash from card type when getting main type

Browse source
This commit is contained in:
Daenyth 2014-06-21 12:42:46 -04:00
parent c3ad6b1f69
commit 38b83acae0
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/carddatabase.cpp
View file

@ -295,6 +295,8 @@ QString CardInfo::getMainCardType() const
int pos; int pos;
if ((pos = result.indexOf('-')) != -1) if ((pos = result.indexOf('-')) != -1)
result.remove(pos, result.length()); result.remove(pos, result.length());
if ((pos = result.indexOf("—")) != -1)
result.remove(pos, result.length());
if ((pos = result.indexOf("//")) != -1) if ((pos = result.indexOf("//")) != -1)
result.remove(pos, result.length()); result.remove(pos, result.length());
result = result.simplified(); result = result.simplified();

4
cockatrice/src/main.cpp
View file

@ -116,9 +116,9 @@ int main(int argc, char *argv[])
qtTranslator = new QTranslator; qtTranslator = new QTranslator;
translator = new QTranslator; translator = new QTranslator;
installNewTranslator(); installNewTranslator();
qsrand(QDateTime::currentDateTime().toTime_t()); qsrand(QDateTime::currentDateTime().toTime_t());
bool startMainProgram = true; bool startMainProgram = true;
const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
if (!db->getLoadSuccess()) if (!db->getLoadSuccess())