diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 3e700223e..136e62143 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -6555,7 +6555,7 @@ public: const string getMenuText() { - return "phase alter"; + return "Phase Alter"; } APhaseAlter * clone() const diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index e74ea7033..b79f4868b 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -96,7 +96,7 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string JRenderer * renderer = JRenderer::GetInstance(); bool hiddenview = aType == MTGAbility::HIDDENVIEW?true:false; - if (!targetQuad) + if (!targetQuad && !mytargetsQuad.size()) { /*if(source->controller()->isHuman() && source->controller()->opponent()->isAI() && !alt2.size() && _(action).c_str() == source->name) mFont->DrawString("You play ", x + 35, y-15 + GetVerticalTextOffset(), JGETEXT_LEFT); @@ -1040,6 +1040,9 @@ void ActionStack::Update(float dt) if (getCurrentTutorial() && (observer->players[0]->isHuman() || observer->players[1]->isHuman() ) ) return; + if (observer->mLayers->actionLayer()->menuObject || observer->LPWeffect) + return;//dont do any of this if a menuobject exist. + askIfWishesToInterrupt = NULL; //modal = 0;