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

Adjust to rebase.

Browse source 
Took 48 minutes
This commit is contained in:
Lukas Brübach 2025-08-26 08:41:08 +02:00
parent 3cdd3df666
commit aaa2c05b87
5 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/client/tabs/tab_home.h
View file

@ -1,7 +1,7 @@
#ifndef TAB_HOME_H #ifndef TAB_HOME_H
#define TAB_HOME_H #define TAB_HOME_H
#include "../game_logic/abstract_client.h" #include "../../server/abstract_client.h"
#include "../ui/widgets/general/home_widget.h" #include "../ui/widgets/general/home_widget.h"
#include "tab.h" #include "tab.h"

4
cockatrice/src/client/ui/widgets/cards/card_info_picture_art_crop_widget.cpp
View file

@ -12,8 +12,8 @@ QPixmap CardInfoPictureArtCropWidget::getProcessedBackground(const QSize &target
{ {
// Load the full-resolution card image, not a pre-scaled one // Load the full-resolution card image, not a pre-scaled one
QPixmap fullResPixmap; QPixmap fullResPixmap;
if (getInfo()) { if (getCard()) {
PictureLoader::getPixmap(fullResPixmap, getInfo(), QSize(745, 1040)); // or a high default size PictureLoader::getPixmap(fullResPixmap, getCard(), QSize(745, 1040)); // or a high default size
} else { } else {
PictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040)); PictureLoader::getCardBackPixmap(fullResPixmap, QSize(745, 1040));
} }

4
cockatrice/src/client/ui/widgets/general/home_widget.cpp
View file

@ -52,11 +52,11 @@ void HomeWidget::startCardShuffleTimer()
void HomeWidget::updateRandomCard() void HomeWidget::updateRandomCard()
{ {
CardInfoPtr newCard = CardDatabaseManager::getInstance()->getRandomCard(); ExactCard newCard = CardDatabaseManager::getInstance()->getRandomCard();
if (!newCard) if (!newCard)
return; return;
connect(newCard.data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties); connect(newCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, &HomeWidget::updateBackgroundProperties);
backgroundSource->setCard(newCard); backgroundSource->setCard(newCard);
} }

16
cockatrice/src/game/cards/card_database.cpp
View file

@ -214,15 +214,17 @@ ExactCard CardDatabase::guessCard(const CardRef &cardRef) const
return ExactCard(temp, findPrintingWithId(temp, cardRef.providerId)); return ExactCard(temp, findPrintingWithId(temp, cardRef.providerId));
} }
CardInfoPtr CardDatabase::getRandomCard() ExactCard CardDatabase::getRandomCard()
{ {
if (cards.isEmpty()) return nullptr; if (cards.isEmpty())
return ExactCard();
const auto keys = cards.keys(); const auto keys = cards.keys();
int randomIndex = QRandomGenerator::global()->bounded(keys.size()); int randomIndex = QRandomGenerator::global()->bounded(keys.size());
const QString &randomKey = keys.at(randomIndex); const QString &randomKey = keys.at(randomIndex);
CardInfoPtr randomCard = getCardFromMap(cards, randomKey);
return getCardFromMap(cards, randomKey); return ExactCard{randomCard, getPreferredPrinting(randomCard)};
} }
CardSetPtr CardDatabase::getSet(const QString &setName) CardSetPtr CardDatabase::getSet(const QString &setName)
@ -250,6 +252,14 @@ SetList CardDatabase::getSetList() const
return result; return result;
} }
CardInfoPtr CardDatabase::getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const
{
if (cardMap.contains(cardName))
return cardMap.value(cardName);
return {};
}
LoadStatus CardDatabase::loadFromFile(const QString &fileName) LoadStatus CardDatabase::loadFromFile(const QString &fileName)
{ {
QFile file(fileName); QFile file(fileName);

2
cockatrice/src/game/cards/card_database.h
View file

@ -53,7 +53,6 @@ protected:
QVector<ICardDatabaseParser *> availableParsers; QVector<ICardDatabaseParser *> availableParsers;
private: private:
CardInfoPtr getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const;
void checkUnknownSets(); void checkUnknownSets();
void refreshCachedReverseRelatedCards(); void refreshCachedReverseRelatedCards();
@ -100,6 +99,7 @@ public:
return cards; return cards;
} }
SetList getSetList() const; SetList getSetList() const;
CardInfoPtr getCardFromMap(const CardNameMap &cardMap, const QString &cardName) const;
LoadStatus loadFromFile(const QString &fileName); LoadStatus loadFromFile(const QString &fileName);
bool saveCustomTokensToFile(); bool saveCustomTokensToFile();
QStringList getAllMainCardTypes() const; QStringList getAllMainCardTypes() const;