gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-21 23:00:24 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into deck-parser-ampersand

Browse Source 
Conflicts:
	common/decklist.cpp
This commit is contained in:
arxanas
2014-07-19 18:12:49 -04:00
parent 0eb97c91b3 843eba817b
commit b1bfda9f4e
97 changed files with 4910 additions and 4254 deletions
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("’");