From b4e25838bd2e228fbe7651a1059909c4590ab721 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 14 Mar 2017 09:15:14 +0800 Subject: [PATCH] update targetchooser --- projects/mtg/src/TargetChooser.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/mtg/src/TargetChooser.cpp b/projects/mtg/src/TargetChooser.cpp index 951722a5f..c79b5405d 100644 --- a/projects/mtg/src/TargetChooser.cpp +++ b/projects/mtg/src/TargetChooser.cpp @@ -40,28 +40,28 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta return NEW dredgeChooser(observer,zones,nbzones, card, maxtargets); } - found = s.find("mytgt"); - if (found == 0) - { - MTGCardInstance * target = card->target; - if (ability) target = (MTGCardInstance *) (ability->target); - return NEW CardTargetChooser(observer, target, card); - }; - found = s.find("mychild"); - if (found == 0) + if (found != string::npos) { int maxtargets = 1; return NEW ChildrenChooser(observer, card, maxtargets); }; found = s.find("mytotem"); - if (found == 0) + if (found != string::npos) { int maxtargets = 1; return NEW TotemChooser(observer, card, maxtargets); }; + found = s.find("mytgt"); + if (found == 0) + { + MTGCardInstance * target = card->target; + if (ability) target = (MTGCardInstance *) (ability->target); + return NEW CardTargetChooser(observer, target, card); + }; + found = s.find("targetedplayer"); if (found == 0) {