Consider removed cards.

Took 14 minutes

cockatrice/src/game/board/card_state.cpp

@@ -15,6 +15,17 @@ void CardState::prepareDelete()
         attachedCards.first()->setZone(nullptr); // so that it won't try to call reorganizeCards()
         attachedCards.first()->setAttachedTo(nullptr);
     }
+
+    if (getAttachedTo() != nullptr) {
+        getAttachedTo()->removeAttachedCard(this);
+        setAttachedTo(nullptr);
+    }
+}
+
+void CardState::deleteLater()
+{
+    prepareDelete();
+    QObject::deleteLater();
 }
 
 void CardState::processCardInfo(const ServerInfo_Card &_info)

cockatrice/src/game/board/card_state.h

@@ -41,6 +41,9 @@ signals:
     void zoneChanged(CardState *changedCard, CardZoneLogic *newZone);
     void visibleChanged(bool visible);
 
+public slots:
+    void deleteLater();
+
 public:
     explicit CardState(PlayerLogic *_owner, const CardRef &cardRef = {}, int _id = -1, CardZoneLogic *_zone = nullptr);
 

cockatrice/src/game/zones/card_zone_logic.cpp

@@ -90,6 +90,8 @@ CardState *CardZoneLogic::takeCard(int position, int cardId, bool toNewZone)
 
     c->setId(cardId);
 
+    emit cardRemoved(c, c->getGridPos().x(), c->getGridPos().y());
+
     emit reorganizeCards();
     emit cardCountChanged();
     return c;
@@ -120,6 +122,8 @@ void CardZoneLogic::removeCard(CardState *card)
 
     cards.removeOne(card);
 
+    emit cardRemoved(card, card->getGridPos().x(), card->getGridPos().y());
+
     emit reorganizeCards();
     emit cardCountChanged();
     player->deleteCard(card);

cockatrice/src/game/zones/card_zone_logic.h

@@ -29,6 +29,7 @@ class CardZoneLogic : public QObject
 
 signals:
     void cardAdded(CardState *addedCard, int x, int y);
+    void cardRemoved(CardState *removedCard, int x, int y);
     void cardCountChanged();
     void reorganizeCards();
     void updateGraphics();

cockatrice/src/game_graphics/board/card_item.cpp

@@ -41,13 +41,6 @@ void CardItem::prepareDelete()
         }
         owner = nullptr;
     }
-
-    state->prepareDelete();
-
-    if (state->getAttachedTo() != nullptr) {
-        state->getAttachedTo()->removeAttachedCard(getState());
-        state->setAttachedTo(nullptr);
-    }
 }
 
 void CardItem::deleteLater()

cockatrice/src/game_graphics/player/menu/player_menu.cpp

@@ -76,6 +76,10 @@ QMenu *PlayerMenu::updateCardMenu(const CardState *card)
         return nullptr;
     }
 
+    if (!player->getLogic()->getGame()->getActiveCard()) {
+        return nullptr;
+    }
+
     // If is spectator (as spectators don't need card menus), return
     // only update the menu if the card is actually selected
     if ((player->getLogic()->getGame()->getPlayerManager()->isSpectator() &&

cockatrice/src/game_graphics/zones/card_zone.cpp

@@ -11,6 +11,7 @@ CardZone::CardZone(CardZoneLogic *_logic, QGraphicsItem *parent)
 {
     connect(logic, &CardZoneLogic::retranslateUi, this, &CardZone::retranslateUi);
     connect(logic, &CardZoneLogic::cardAdded, this, &CardZone::onCardAdded);
+    connect(logic, &CardZoneLogic::cardRemoved, this, &CardZone::onCardRemoved);
     connect(logic, &CardZoneLogic::setGraphicsVisibility, this, [this](bool v) { this->setVisible(v); });
     connect(logic, &CardZoneLogic::updateGraphics, this, [this]() { update(); });
     connect(logic, &CardZoneLogic::reorganizeCards, this, &CardZone::reorganizeCards);
@@ -27,6 +28,20 @@ void CardZone::onCardAdded(CardState *toAdd, int /*x*/, int /*y*/)
     emit cardItemAdded(addedCard);
 }
 
+void CardZone::onCardRemoved(CardState *toRemove, int /*x*/, int /*y*/)
+{
+    CardItem *removedCard = getCardItemForId(toRemove->getId());
+    if (!removedCard) {
+        return;
+    }
+    if (cards.contains(removedCard)) {
+        cards.remove(cards.indexOf(removedCard));
+    }
+    removedCard->setVisible(false);
+    removedCard->setParentItem(nullptr);
+    removedCard->deleteLater();
+}
+
 void CardZone::retranslateUi()
 {
     for (int i = 0; i < cards.size(); ++i) {

cockatrice/src/game_graphics/zones/card_zone.h

@@ -51,6 +51,7 @@ public slots:
      * connection in CardZone's constructor dispatches through the vtable.
      */
     virtual void onCardAdded(CardState *addedCard, int x, int y);
+    void onCardRemoved(CardState *toAdd, int x, int y);
 
 signals:
     void cardItemAdded(CardItem *added);