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

Hide Action stack if there's a menu object

Browse Source
This commit is contained in:
Anthony Calosa
2017-03-10 19:24:39 +08:00
parent 37642c1f78
commit 8f61b590f8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+1 -1
View File
@@ -6555,7 +6555,7 @@ public:
const string getMenuText() const string getMenuText()
{ {
return "phase alter"; return "Phase Alter";
} }
APhaseAlter * clone() const APhaseAlter * clone() const
projects/mtg/src/ActionStack.cpp
+4 -1
View File
@@ -96,7 +96,7 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
JRenderer * renderer = JRenderer::GetInstance(); JRenderer * renderer = JRenderer::GetInstance();
bool hiddenview = aType == MTGAbility::HIDDENVIEW?true:false; 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) /*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); 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() ) ) if (getCurrentTutorial() && (observer->players[0]->isHuman() || observer->players[1]->isHuman() ) )
return; return;
if (observer->mLayers->actionLayer()->menuObject || observer->LPWeffect)
return;//dont do any of this if a menuobject exist.
askIfWishesToInterrupt = NULL; askIfWishesToInterrupt = NULL;
//modal = 0; //modal = 0;