From 62681f7f8d6f467b22a7884f5f9f41abd86660b4 Mon Sep 17 00:00:00 2001 From: backendr Date: Thu, 18 May 2017 23:03:21 +0200 Subject: [PATCH] contect menu fix (#2719) --- cockatrice/src/carditem.cpp | 1 - cockatrice/src/player.cpp | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/carditem.cpp b/cockatrice/src/carditem.cpp index 93d7d702..556d8de1 100644 --- a/cockatrice/src/carditem.cpp +++ b/cockatrice/src/carditem.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include "gamescene.h" #include "carditem.h" diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index b2220499..8400a91b 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -2079,7 +2079,7 @@ void Player::cardMenuAction() } case cmClone: { Command_CreateToken *cmd = new Command_CreateToken; - cmd->set_zone(card->getZone()->getName().toStdString()); + cmd->set_zone("table"); cmd->set_card_name(card->getName().toStdString()); cmd->set_color(card->getColor().toStdString()); cmd->set_pt(card->getPT().toStdString()); @@ -2519,6 +2519,13 @@ void Player::updateCardMenu(const CardItem *card) } } else cardMenu->addMenu(moveMenu); + } else { + if (card->getZone() + && card->getZone()->getName() != "hand") { + cardMenu->addAction(aDrawArrow); + cardMenu->addSeparator(); + cardMenu->addAction(aClone); + } } }