- revert r1187
- fix a bug with "@damaged" (see slith bloodletter test)
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-10-26 13:31:30 +00:00
parent 772ddd9ced
commit e762a5f983
3 changed files with 48 additions and 9 deletions

View File

@@ -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;