Skip to content
GitLab
Commit f94fac80 authored by Max-Wilhelm Bruker's avatar Max-Wilhelm Bruker
Browse files

Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

parents 04a3f951 d2331518
Hide whitespace changes
Inline Side-by-side
cockatrice/src/player.cpp
View file @ f94fac80
...@@ -807,9 +807,12 @@ void Player::eventMoveCard(Event_MoveCard *event) ...@@ -807,9 +807,12 @@ void Player::eventMoveCard(Event_MoveCard *event)
return; return;
card->setName(event->getCardName()); card->setName(event->getCardName());
if (card->getAttachedTo() && (startZone != targetZone)) if (card->getAttachedTo() && (startZone != targetZone)) {
CardItem *parentCard = card->getAttachedTo();
card->setAttachedTo(0); card->setAttachedTo(0);
parentCard->getZone()->reorganizeCards();
}
card->deleteDragItem(); card->deleteDragItem();
card->setId(event->getNewCardId()); card->setId(event->getNewCardId());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment