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

combined nbzone increment and zone assignment into one statement.

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2011-02-13 13:25:41 +00:00
parent 6b89899d1b
commit 5be429c48f
1 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/TargetChooser.cpp
+16 -28
View File
@@ -97,50 +97,38 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
if (zoneName.compare("*") == 0) if (zoneName.compare("*") == 0)
{ {
zones[nbzones] = MTGGameZone::ALL_ZONES; zones[nbzones++] = MTGGameZone::ALL_ZONES;
} }
else if (zoneName.compare("graveyard") == 0) else if (zoneName.compare("graveyard") == 0)
{ {
zones[nbzones] = MTGGameZone::MY_GRAVEYARD; zones[nbzones++] = MTGGameZone::MY_GRAVEYARD;
nbzones++; zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;
zones[nbzones] = MTGGameZone::OPPONENT_GRAVEYARD;
} }
else if (zoneName.compare("battlefield") == 0 || zoneName.compare("inplay") == 0) else if (zoneName.compare("battlefield") == 0 || zoneName.compare("inplay") == 0)
{ {
zones[nbzones] = MTGGameZone::MY_BATTLEFIELD; zones[nbzones++] = MTGGameZone::MY_BATTLEFIELD;
nbzones++; zones[nbzones++] = MTGGameZone::OPPONENT_BATTLEFIELD;
zones[nbzones] = MTGGameZone::OPPONENT_BATTLEFIELD;
} }
else if (zoneName.compare("nonbattlezone") == 0) else if (zoneName.compare("nonbattlezone") == 0)
{ {
zones[nbzones] = MTGGameZone::MY_GRAVEYARD; zones[nbzones++] = MTGGameZone::MY_GRAVEYARD;
nbzones++; zones[nbzones++] = MTGGameZone::OPPONENT_GRAVEYARD;
zones[nbzones] = MTGGameZone::OPPONENT_GRAVEYARD; zones[nbzones++] = MTGGameZone::MY_LIBRARY;
nbzones++; zones[nbzones++] = MTGGameZone::OPPONENT_LIBRARY;
zones[nbzones] = MTGGameZone::MY_LIBRARY; zones[nbzones++] = MTGGameZone::MY_HAND;
nbzones++; zones[nbzones++] = MTGGameZone::OPPONENT_HAND;
zones[nbzones] = MTGGameZone::OPPONENT_LIBRARY; zones[nbzones++] = MTGGameZone::OPPONENT_EXILE;
nbzones++;
zones[nbzones] = MTGGameZone::MY_HAND;
nbzones++;
zones[nbzones] = MTGGameZone::OPPONENT_HAND;
nbzones++;
zones[nbzones] = MTGGameZone::MY_EXILE;
nbzones++;
zones[nbzones] = MTGGameZone::OPPONENT_EXILE;
} }
else if (zoneName.compare("stack") == 0) else if (zoneName.compare("stack") == 0)
{ {
zones[nbzones] = MTGGameZone::MY_STACK; zones[nbzones++] = MTGGameZone::MY_STACK;
nbzones++; zones[nbzones++] = MTGGameZone::OPPONENT_STACK;
zones[nbzones] = MTGGameZone::OPPONENT_STACK;
} }
else else
{ {
int zone = MTGGameZone::zoneStringToId(zoneName); int zone = MTGGameZone::zoneStringToId(zoneName);
if (zone) zones[nbzones] = zone; if (zone) zones[nbzones++] = zone;
} }
nbzones++;
} }
} }
else else
@@ -154,7 +142,7 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
TargetChooser * tc = NULL; TargetChooser * tc = NULL;
int maxtargets = 1; int maxtargets = 1;
CardDescriptor * cd = NULL; CardDescriptor * cd = NULL;
//max targets allowed //max targets allowed
size_t limit = s1.find('<'); size_t limit = s1.find('<');
if (limit != string::npos) if (limit != string::npos)
{ {