jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-26 00:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 160c43fad1 into 2a3c4a2455

Browse source
This commit is contained in:
BruebachL 2026-06-21 03:00:24 +08:00 • committed by GitHub
commit 69f9345778
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
62 changed files with 823 additions and 704 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/interface/widgets/cards/card_info_display_widget.cpp
View file

@ -65,7 +65,7 @@ void CardInfoDisplayWidget::setCard(const CardRef &cardRef)
void CardInfoDisplayWidget::setCard(AbstractCardItem *card)
{
setCard(card->getCard());
setCard(card->getState()->getCard());
}
void CardInfoDisplayWidget::clear()

2
cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp
View file

@ -171,7 +171,7 @@ void CardInfoFrameWidget::setCard(const CardRef &cardRef)
void CardInfoFrameWidget::setCard(AbstractCardItem *card)
{
if (card) {
setCard(card->getCard());
setCard(card->getState()->getCard());
}
}

2
cockatrice/src/interface/widgets/tabs/tab_game.cpp
View file

@ -658,7 +658,7 @@ PlayerLogic *TabGame::addPlayer(PlayerLogic *newPlayer)
auto *view = scene->viewForPlayer(newPlayer->getPlayerInfo()->getId());
connect(newPlayer, &PlayerLogic::newCardAdded, this, &TabGame::newCardAdded);
connect(view, &PlayerGraphicsItem::cardItemAdded, this, &TabGame::newCardAdded);
connect(newPlayer, &PlayerLogic::openDeckEditor, this, &TabGame::openDeckEditor);
connect(view->getPlayerMenu(), &PlayerMenu::cardMenuUpdated, this, &TabGame::setCardMenu);
connect(view, &PlayerGraphicsItem::cardInfoRequested, this, &TabGame::viewCardInfo);