- Fix for issue 650 (tidal Warrior effect doesn't end at end of turn)

- Fix PSP compilation
This commit is contained in:
wagic.the.homebrew
2011-05-07 04:10:47 +00:00
parent 062d5f9485
commit f96635541d
8 changed files with 50 additions and 2 deletions

View File

@@ -2163,11 +2163,23 @@ int MultiAbility::addToGame()
MTGAbility * a = abilities[i]->clone();
a->target = target;
a->addToGame();
clones.push_back(a);
}
MTGAbility::addToGame();
return 1;
}
int MultiAbility::destroy()
{
for (size_t i = 0; i < clones.size(); ++i)
{
//I'd like to call game->removeObserver here instead of using forceDestroy, but I get a weird crash after that, need to investigate a bit
clones[i]->forceDestroy = 1;
}
clones.clear();
return ActivatedAbility::destroy();
}
const char * MultiAbility::getMenuText()
{
if (abilities.size())