fixed a issue where token workaround revealed that 2 "may" abilities back to back screws up "isInterrupting" player variable..this was only when the may ability contained manaproducers, which truely no longer use the stack in any format.

This commit is contained in:
omegablast2002@yahoo.com
2011-04-28 10:20:42 +00:00
parent 531c7f20ae
commit 7840e3cde8
2 changed files with 3 additions and 0 deletions

View File

@@ -940,6 +940,7 @@ class MayAbility: public MTGAbility, public NestedAbility
public:
int triggered;
bool must;
Player * previousInterrupter;
MTGAbility * mClone;
MayAbility(int _id, MTGAbility * _ability, MTGCardInstance * _source, bool must = false);

View File

@@ -1902,6 +1902,7 @@ void MayAbility::Update(float dt)
return;
}
game->mLayers->actionLayer()->setMenuObject(source, must);
previousInterrupter = game->isInterrupting;
game->mLayers->stackLayer()->setIsInterrupting(source->controller());
}
}
@@ -1919,6 +1920,7 @@ int MayAbility::testDestroy()
return 0;
if (game->mLayers->actionLayer()->getIndexOf(mClone) != -1)
return 0;
game->mLayers->stackLayer()->setIsInterrupting(previousInterrupter);
return 1;
}