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

Merge pull request #214 from pliu037/master

Browse source 
Added better support for custom card images
This commit is contained in:
Gavin Bisesi 2014-07-31 13:42:57 -04:00
commit ffed0e00fe
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/carddatabase.cpp
View file

@ -129,8 +129,9 @@ void PictureLoader::processLoadQueue()
QString setName = ptl.getSetName(); QString setName = ptl.getSetName();
QImage image; QImage image;
if (!image.load(QString("%1/%2/%3.full.jpg").arg(picsPath).arg("CUSTOM").arg(correctedName))) {
if (!image.load(QString("%1/%2/%3.full.jpg").arg(picsPath).arg(setName).arg(correctedName))) if (!image.load(QString("%1/%2/%3.full.jpg").arg(picsPath).arg(setName).arg(correctedName)))
if (!image.load(QString("%1/%2/%3%4.full.jpg").arg(picsPath).arg(setName).arg(correctedName).arg(1))) //if (!image.load(QString("%1/%2/%3%4.full.jpg").arg(picsPath).arg(setName).arg(correctedName).arg(1)))
if (!image.load(QString("%1/%2/%3/%4.full.jpg").arg(picsPath).arg("downloadedPics").arg(setName).arg(correctedName))) { if (!image.load(QString("%1/%2/%3/%4.full.jpg").arg(picsPath).arg("downloadedPics").arg(setName).arg(correctedName))) {
if (picDownload) { if (picDownload) {
cardsToDownload.append(ptl); cardsToDownload.append(ptl);
@ -142,7 +143,7 @@ void PictureLoader::processLoadQueue()
else else
emit imageLoaded(ptl.getCard(), QImage()); emit imageLoaded(ptl.getCard(), QImage());
} }
continue; }
} }
emit imageLoaded(ptl.getCard(), image); emit imageLoaded(ptl.getCard(), image);