Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide Highlight Border

Browse Source 
When revealing cards, Hide Highlight Border
This commit is contained in:
Anthony Calosa
2016-06-29 08:59:58 +08:00
parent b16e70c363
commit 140ee7b183
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -793,6 +793,9 @@ bool MTGCardInstance::StackIsEmptyandSorcerySpeed()
//check targetted? //check targetted?
bool MTGCardInstance::isTargetted() 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) if(getObserver()->mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0)
{ {
ActionStack * stack = observer->mLayers->stackLayer(); ActionStack * stack = observer->mLayers->stackLayer();
@@ -818,6 +821,9 @@ bool MTGCardInstance::isTargetted()
//check targetter? //check targetter?
bool MTGCardInstance::isTargetter() 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) if(getObserver()->mLayers->stackLayer()->count(0, NOT_RESOLVED) != 0)
{ {
ActionStack * stack = observer->mLayers->stackLayer(); ActionStack * stack = observer->mLayers->stackLayer();
@@ -1039,7 +1045,6 @@ ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * new
if(newCost->getCost(color) > 0) if(newCost->getCost(color) > 0)
newCost->remove(color,1); newCost->remove(color,1);
}//end3 }//end3
SAFE_DELETE(original);
if(!noTrinisphere) if(!noTrinisphere)
{ {
@@ -1062,6 +1067,8 @@ ManaCost * MTGCardInstance::computeNewCost(MTGCardInstance * card,ManaCost * new
} }
} }
SAFE_DELETE(original);
return newCost; return newCost;
} }