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

changed a piece of logic back to it's original logic, the refactor in last commit broke some functionality in multitarget effects which have no test added yet.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2011-09-05 17:40:25 +00:00
parent 5498187200
commit fdfcaf854d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
projects/mtg/src/MTGAbility.cpp
View File

@@ -2721,8 +2721,7 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card, int
if(moreThanOneTarget)
a->target = spell->getNextTarget();
if(a->target && moreThanOneTarget
&& !dynamic_cast<MayAbility*>(a)) //MayAbility is an exception to multitargets, as we don't want to add the same text n times to a menu
if(a->target && moreThanOneTarget)
{
while(a->target)
{
@@ -2730,11 +2729,20 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card, int
{
a->resolve();
}
else
else if(!dynamic_cast<MayAbility*>(a))
{
MTGAbility * mClone = a->clone();
mClone->addToGame();
}
else if(dynamic_cast<MayAbility*>(a) && a->target == spell->tc->targets[0])
{
//this only keeps a menu objects from displaying multiple options of the same ability during the resolve of a multiability effect.
//meaning as long as it is targeting the first target add it, else don't display it again.
//this does not make "may" abilities an exception to multitarget simply on mayabilities resolving from a multitarget
//spell, only display the menu once. this is purely cosmetic.
MTGAbility * mClone = a->clone();
mClone->addToGame();
}
a->target = spell->getNextTarget(a->target);
}
SAFE_DELETE(a);