From f2944dbbf2bec45ace738c632d0664a0aa57e631 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Tue, 21 Jan 2025 23:31:55 -0800 Subject: [PATCH] pass toNewZone down --- cockatrice/src/game/zones/card_zone.cpp | 2 +- cockatrice/src/game/zones/view_zone.cpp | 2 +- cockatrice/src/game/zones/view_zone.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/game/zones/card_zone.cpp b/cockatrice/src/game/zones/card_zone.cpp index 337c03eec..f3ebbd214 100644 --- a/cockatrice/src/game/zones/card_zone.cpp +++ b/cockatrice/src/game/zones/card_zone.cpp @@ -190,7 +190,7 @@ CardItem *CardZone::takeCard(int position, int cardId, bool toNewZone) return nullptr; for (auto *view : views) { - view->removeCard(position); + view->removeCard(position, toNewZone); } CardItem *c = cards.takeAt(position); diff --git a/cockatrice/src/game/zones/view_zone.cpp b/cockatrice/src/game/zones/view_zone.cpp index 3cd2be8a3..c5b46eb02 100644 --- a/cockatrice/src/game/zones/view_zone.cpp +++ b/cockatrice/src/game/zones/view_zone.cpp @@ -365,7 +365,7 @@ void ZoneViewZone::handleDropEvent(const QList &dragItems, player->sendGameCommand(cmd); } -void ZoneViewZone::removeCard(int position) +void ZoneViewZone::removeCard(int position, bool toNewZone) { if (isReversed) { position -= cards.first()->getId(); diff --git a/cockatrice/src/game/zones/view_zone.h b/cockatrice/src/game/zones/view_zone.h index 41ed99609..3c69317aa 100644 --- a/cockatrice/src/game/zones/view_zone.h +++ b/cockatrice/src/game/zones/view_zone.h @@ -71,7 +71,7 @@ public: void reorganizeCards() override; void initializeCards(const QList &cardList = QList()); bool prepareAddCard(int x); - void removeCard(int position); + void removeCard(int position, bool toNewZone); int getNumberCards() const { return numberCards;