From 140ee7b1830af902619446a5202cd0e78b41f25d Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Wed, 29 Jun 2016 08:59:58 +0800 Subject: [PATCH] Hide Highlight Border When revealing cards, Hide Highlight Border --- projects/mtg/src/MTGCardInstance.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index 6b63ec740..eb20e1bb3 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -793,6 +793,9 @@ bool MTGCardInstance::StackIsEmptyandSorcerySpeed() //check targetted? bool MTGCardInstance::isTargetted() { + if(controller()->game->reveal->cards.size() || controller()->opponent()->game->reveal->cards.size()) + return false; + if(getObserver()->mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0) { ActionStack * stack = observer->mLayers->stackLayer(); @@ -818,6 +821,9 @@ bool MTGCardInstance::isTargetted() //check targetter? bool MTGCardInstance::isTargetter() { + if(controller()->game->reveal->cards.size() || controller()->opponent()->game->reveal->cards.size()) + return false; + if(getObserver()->mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0) { ActionStack * stack = observer->mLayers->stackLayer(); @@ -1039,7 +1045,6 @@ ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * new if(newCost->getCost(color) > 0) newCost->remove(color,1); }//end3 - SAFE_DELETE(original); if(!noTrinisphere) { @@ -1062,6 +1067,8 @@ ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * new } } + SAFE_DELETE(original); + return newCost; }