Erwan
- revert r1187 - fix a bug with "@damaged" (see slith bloodletter test)
This commit is contained in:
@@ -118,16 +118,14 @@ TriggeredAbility * AbilityFactory::parseTrigger(string magicText, int id, Spell
|
||||
tc->targetter = NULL;
|
||||
found = s.find("from(");
|
||||
|
||||
TargetChooser *fromTc = NULL;
|
||||
if (found != string::npos){
|
||||
end = s.find (")", found);
|
||||
starget = s.substr(found+5,end - found - 5);
|
||||
TargetChooser * fromTc = tcf.createTargetChooser(starget,card);
|
||||
fromTc->targetter = NULL;
|
||||
return NEW TrDamaged(id,card,tc,fromTc);
|
||||
}else{
|
||||
TargetChooser *fromTc = NULL;
|
||||
if (found != string::npos){
|
||||
end = s.find (")", found);
|
||||
starget = s.substr(found+5,end - found - 5);
|
||||
fromTc = tcf.createTargetChooser(starget,card);
|
||||
fromTc->targetter = NULL;
|
||||
}
|
||||
return NEW TrDamaged(id,card,tc,fromTc);
|
||||
}
|
||||
}
|
||||
|
||||
int who = 0;
|
||||
|
||||
Reference in New Issue
Block a user