aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #200 from arxanas/4x-cardname

Browse source 
Fix #184: Deck loader reads 4x cardname correctly.
This commit is contained in:
Gavin Bisesi 2014-07-09 11:50:33 -04:00
commit ca5d719d7d
38 changed files with 4517 additions and 4510 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/decklist.cpp
View file

@ -547,14 +547,21 @@ bool DeckList::loadFromStream_Plain(QTextStream &in)
line.remove(rx);
line = line.simplified();
int i = line.indexOf(' ');
int cardNameStart = i + 1;
// If the count ends with an 'x', ignore it. For example,
// "4x Storm Crow" will count 4 correctly.
if (i > 0 && line[i - 1] == 'x') {
i--;
}
bool ok;
int number = line.left(i).toInt(&ok);
if (!ok)
continue;
QString cardName = line.mid(i + 1);
QString cardName = line.mid(cardNameStart);
// Common differences between cockatrice's card names
// and what's commonly used in decklists
rx.setPattern("’");