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

Merge pull request #911 from ctrlaltca/fix_67

Browse source 
Large decks (up to 8000-ish cards) no longer make client crash; Fix #67
This commit is contained in:
Zach 2015-04-08 10:56:33 -04:00
commit 6f69485f99
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cockatrice/src/abstractcarditem.cpp
View file

@ -91,7 +91,10 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
CardInfo *imageSource = facedown ? db->getCard() : info; CardInfo *imageSource = facedown ? db->getCard() : info;
QPixmap translatedPixmap; QPixmap translatedPixmap;
imageSource->getPixmap(translatedSize.toSize(), translatedPixmap); // don't even spend time trying to load the picture if our size is too small
if(translatedSize.width() > 10)
imageSource->getPixmap(translatedSize.toSize(), translatedPixmap);
painter->save(); painter->save();
QColor bgColor = Qt::transparent; QColor bgColor = Qt::transparent;
if (translatedPixmap.isNull()) { if (translatedPixmap.isNull()) {

4
cockatrice/src/carddatabase.cpp
View file

@ -970,7 +970,9 @@ QStringList CardDatabase::getAllMainCardTypes() const
void CardDatabase::cacheCardPixmaps(const QStringList &cardNames) void CardDatabase::cacheCardPixmaps(const QStringList &cardNames)
{ {
QPixmap tmp; QPixmap tmp;
for (int i = 0; i < cardNames.size(); ++i) // never cache more than 300 cards at once for a single deck
int max = qMin(cardNames.size(), 300);
for (int i = 0; i < max; ++i)
getCard(cardNames[i])->loadPixmap(tmp); getCard(cardNames[i])->loadPixmap(tmp);
} }