From a216a6989b031bd11591ea0f0cdaeeeb160e7983 Mon Sep 17 00:00:00 2001 From: zethfoxster Date: Sun, 3 Jul 2016 17:07:22 -0400 Subject: [PATCH] more fixes --- projects/mtg/include/AllAbilities.h | 13 ++++++++++--- projects/mtg/src/ActionLayer.cpp | 4 ++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index ad4036ced..5a652b823 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -275,9 +275,16 @@ private: } if(s == "prex") { - ManaCost * cX = card->controller()->getManaPool()->Diff(card->getManaCost()); - intValue = cX->getCost(Constants::NB_Colors); - delete cX; + if (card->setX > -1) + { + intValue = card->setX; + } + else + { + ManaCost * cX = card->controller()->getManaPool()->Diff(card->getManaCost()); + intValue = cX->getCost(Constants::NB_Colors); + delete cX; + } } else if (s == "x" || s == "X") { diff --git a/projects/mtg/src/ActionLayer.cpp b/projects/mtg/src/ActionLayer.cpp index 1af691e8b..06162dd1a 100644 --- a/projects/mtg/src/ActionLayer.cpp +++ b/projects/mtg/src/ActionLayer.cpp @@ -467,6 +467,10 @@ void ActionLayer::doReactTo(int menuIndex) { int controlid = abilitiesMenu->mObjects[menuIndex]->GetId(); DebugTrace("ActionLayer::doReactTo " << controlid); + if (abilitiesMenu && abilitiesMenu->isMultipleChoice) + { + return ButtonPressedOnMultipleChoice(menuIndex); + } ButtonPressed(0, controlid); } }