jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix clone shortcut not working on opponent's cards (#5251)

Browse source 
* implement fix

* fix nullptr bug

* also add the selectAll action to the always active shortcuts
This commit is contained in:
RickyRister 2024-12-17 20:41:12 -08:00 • committed by GitHub
parent e8e57989ba
commit fd5a649246
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cockatrice/src/game/player/player.cpp
View file

@ -995,6 +995,16 @@ void Player::setShortcutsActive()
aMoveBottomCardToTop->setShortcut(shortcuts.getSingleShortcut("Player/aMoveBottomCardToTop"));
aPlayFacedown->setShortcut(shortcuts.getSingleShortcut("Player/aPlayFacedown"));
aPlay->setShortcut(shortcuts.getSingleShortcut("Player/aPlay"));
if (!game->getIsLocalGame()) {
/* Attach all card menu actions that also work on the opponent's cards to the TabGame object so that those
* shortcuts will be active regardless of whether your card menu currently exists.
* Added as a workaround to get the clone keyboard shortcut to work on opponent's cards.
*/
game->addAction(aClone);
game->addAction(aDrawArrow);
game->addAction(aSelectAll);
}
}
void Player::setShortcutsInactive()
@ -3057,12 +3067,23 @@ void Player::cardMenuAction()
}
}
} else {
CardZone *zone = cardList[0]->getZone();
if (!zone) {
return;
}
Player *startPlayer = zone->getPlayer();
if (!startPlayer) {
return;
}
int startPlayerId = startPlayer->getId();
QString startZone = zone->getName();
ListOfCardsToMove idList;
for (const auto &i : cardList) {
idList.add_card()->set_card_id(i->getId());
}
int startPlayerId = cardList[0]->getZone()->getPlayer()->getId();
QString startZone = cardList[0]->getZone()->getName();
switch (static_cast<CardMenuActionType>(a->data().toInt())) {
case cmMoveToTopLibrary: {