From 299bb4f9fa803e803f42f30f528eb37667b08a61 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Fri, 21 Jan 2011 21:55:12 +0000 Subject: [PATCH] removing the rest of the originatingZone code mike added, as we already have this variable as card->currentZone --- projects/mtg/src/MTGRules.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/mtg/src/MTGRules.cpp b/projects/mtg/src/MTGRules.cpp index c31077e0a..d12fbda04 100644 --- a/projects/mtg/src/MTGRules.cpp +++ b/projects/mtg/src/MTGRules.cpp @@ -324,10 +324,10 @@ int MTGAlternativeCostRule::reactToClick(MTGCardInstance * card) if (playerMana->canAfford( alternateCost ) ) card->paymenttype = MTGAbility::ALTERNATIVE_COST; - return reactToClick(card, card->getManaCost()->alternative, player->game->hand, ManaCost::MANA_PAID_WITH_ALTERNATIVE); + return reactToClick(card, card->getManaCost()->alternative, ManaCost::MANA_PAID_WITH_ALTERNATIVE); } -int MTGAlternativeCostRule::reactToClick(MTGCardInstance * card, ManaCost *alternateCost, MTGGameZone * originatingZone, int alternateCostType){ +int MTGAlternativeCostRule::reactToClick(MTGCardInstance * card, ManaCost *alternateCost, int alternateCostType){ Player * player = game->currentlyActing(); ManaCost * playerMana = player->getManaPool(); @@ -458,7 +458,7 @@ int MTGBuyBackRule::reactToClick(MTGCardInstance * card) if (playerMana->canAfford(alternateCost)) card->paymenttype = MTGAbility::BUYBACK_COST; - return MTGAlternativeCostRule::reactToClick(card, alternateCost, player->game->hand, ManaCost::MANA_PAID_WITH_BUYBACK); + return MTGAlternativeCostRule::reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_BUYBACK); } @@ -510,7 +510,7 @@ int MTGFlashBackRule::reactToClick(MTGCardInstance * card) if ( playerMana->canAfford(alternateCost) ) card->paymenttype = MTGAbility::FLASHBACK_COST; - return MTGAlternativeCostRule::reactToClick(card, alternateCost, player->game->graveyard, ManaCost::MANA_PAID_WITH_FLASHBACK); + return MTGAlternativeCostRule::reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_FLASHBACK); } @@ -568,7 +568,7 @@ int MTGRetraceRule::reactToClick(MTGCardInstance * card) if (playerMana->canAfford(alternateCost)) card->paymenttype = MTGAbility::RETRACE_COST; - return MTGAlternativeCostRule::reactToClick(card, alternateCost, player->game->graveyard, ManaCost::MANA_PAID_WITH_RETRACE); + return MTGAlternativeCostRule::reactToClick(card, alternateCost, ManaCost::MANA_PAID_WITH_RETRACE); }