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

more fixes

Browse Source
This commit is contained in:
zethfoxster
2016-07-03 17:07:22 -04:00
parent 050bf5f73c
commit a216a6989b
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
projects/mtg/include/AllAbilities.h
View File

@@ -275,9 +275,16 @@ private:
} }
if(s == "prex") if(s == "prex")
{ {
ManaCost * cX = card->controller()->getManaPool()->Diff(card->getManaCost()); if (card->setX > -1)
intValue = cX->getCost(Constants::NB_Colors); {
delete cX; 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") else if (s == "x" || s == "X")
{ {

4
projects/mtg/src/ActionLayer.cpp
View File

@@ -467,6 +467,10 @@ void ActionLayer::doReactTo(int menuIndex)
{ {
int controlid = abilitiesMenu->mObjects[menuIndex]->GetId(); int controlid = abilitiesMenu->mObjects[menuIndex]->GetId();
DebugTrace("ActionLayer::doReactTo " << controlid); DebugTrace("ActionLayer::doReactTo " << controlid);
if (abilitiesMenu && abilitiesMenu->isMultipleChoice)
{
return ButtonPressedOnMultipleChoice(menuIndex);
}
ButtonPressed(0, controlid); ButtonPressed(0, controlid);
} }
} }