Merge branch 'master' into cmake

This commit is contained in:
xawotihs
2016-06-29 21:36:47 +02:00
40 changed files with 15689 additions and 9603 deletions

View File

@@ -759,9 +759,10 @@ int TapTargetCost::isPaymentSet()
int TapTargetCost::doPay()
{
MTGCardInstance * _target = (MTGCardInstance *) target;
source->storedCard = target->createSnapShot();
if (target)
{
source->storedCard = target->createSnapShot();
_target->tap();
target = NULL;
if (tc)
@@ -802,9 +803,10 @@ int UnTapTargetCost::isPaymentSet()
int UnTapTargetCost::doPay()
{
MTGCardInstance * _target = (MTGCardInstance *) target;
source->storedCard = target->createSnapShot();
if (target)
{
source->storedCard = target->createSnapShot();
_target->untap();
target = NULL;
if (tc)