From defb8e32c60aaebb91863e988b32f087e21220c8 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Wed, 13 Feb 2013 23:33:05 +0000 Subject: [PATCH] corrected the mana not removing from pool correctly bug, sorry about that. --- projects/mtg/src/AllAbilities.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index dfe84b3ee..acee4d8cd 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -2860,6 +2860,7 @@ int AARemoveMana::resolve() { ManaCost * toRemove = manaPool->Diff(player->doesntEmpty); player->getManaPool()->pay(manaPool->Diff(player->doesntEmpty)); + return 1; } else if(!player->doesntEmpty->getConvertedCost() && player->poolDoesntEmpty->getConvertedCost()) { @@ -2871,6 +2872,7 @@ int AARemoveMana::resolve() } player->getManaPool()->pay(manaPool->Diff(toSave)); delete(toSave); + return 1; } else if(player->doesntEmpty->getConvertedCost() && player->poolDoesntEmpty->getConvertedCost()) { @@ -2888,12 +2890,12 @@ int AARemoveMana::resolve() } player->getManaPool()->pay(manaPool->Diff(toSave));//remove the manacost equal to the difference of toSave and the manapool. delete(toSave); + return 1; } - + manaPool->Empty(); } else manaPool->Empty(); - } } else //remove a "standard" mana Description