jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 09:04:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

hide action now applies to all selected cards (#5233)

Browse source 
* hide action now applies to all selected cards

* check card zone before applying action

so that we don't nuke cards from existence when we select across multiple zones

* small fixes

* remove redundant loop

* nullcheck view
This commit is contained in:
RickyRister 2024-12-12 20:42:53 -08:00 • committed by GitHub
parent e9b78c1c59
commit 628bdde939
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3442,6 +3442,19 @@ void Player::actCardCounterTrigger()
sendGameCommand(prepareGameCommand(commandList)); sendGameCommand(prepareGameCommand(commandList));
} }
/**
* @brief returns true if the zone is a unwritable reveal zone view (eg a card reveal window). Will return false if zone
* is nullptr.
*/
static bool isUnwritableRevealZone(CardZone *zone)
{
if (zone && zone->getIsView()) {
auto *view = static_cast<ZoneViewZone *>(zone);
return view && view->getRevealZone() && !view->getWriteableRevealZone();
}
return false;
}
void Player::actPlay() void Player::actPlay()
{ {
auto *card = game->getActiveCard(); auto *card = game->getActiveCard();
@ -3453,9 +3466,11 @@ void Player::actPlay()
void Player::actHide() void Player::actHide()
{ {
auto *card = game->getActiveCard(); for (const auto &item : scene()->selectedItems()) {
if (card) { auto *card = static_cast<CardItem *>(item);
card->getZone()->removeCard(card); if (card && isUnwritableRevealZone(card->getZone())) {
card->getZone()->removeCard(card);
}
} }
} }