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

try to fix psp compilation

Browse Source 
travis error:
../projects/mtg/src/ManaCost.cpp:263:23: error: unused variable
‘counterCheck’ [-Werror=unused-variable]
This commit is contained in:
Anthony Calosa
2016-06-01 09:14:47 +08:00
parent a454c3e564
commit a36b47e500
1 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/ManaCost.cpp
+31 -33
View File
@@ -260,41 +260,39 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
{ {
manaCost->addExtraCost(NEW CycleCost(tc)); manaCost->addExtraCost(NEW CycleCost(tc));
} }
else if(size_t counterCheck = value.find("(") != string::npos) else if(value == "c")
{ {
size_t counter_start = value.find("("); manaCost->add(Constants::MTG_COLOR_WASTE, 1);
size_t counter_end = value.find(")", counter_start); break;
AbilityFactory abf(g); }
string counterString = value.substr(counter_start + 1, counter_end - counter_start - 1); else
Counter * counter = abf.parseCounter(counterString, c); {
size_t separator = value.find(",", counter_start); size_t counter_start = value.find("(");
size_t separator2 = string::npos; size_t counter_end = value.find(")", counter_start);
if (separator != string::npos) AbilityFactory abf(g);
{ string counterString = value.substr(counter_start + 1, counter_end - counter_start - 1);
separator2 = value.find(",", counter_end + 1); Counter * counter = abf.parseCounter(counterString, c);
} size_t separator = value.find(",", counter_start);
SAFE_DELETE(tc); size_t separator2 = string::npos;
size_t target_start = string::npos; if (separator != string::npos)
if (separator2 != string::npos) {
{ separator2 = value.find(",", counter_end + 1);
target_start = value.find(",", counter_end + 1); }
} SAFE_DELETE(tc);
size_t target_end = value.length(); size_t target_start = string::npos;
if (target_start != string::npos && target_end != string::npos) if (separator2 != string::npos)
{ {
string target = value.substr(target_start + 1, target_end - 1 - target_start); target_start = value.find(",", counter_end + 1);
tc = tcf.createTargetChooser(target, c); }
} size_t target_end = value.length();
manaCost->addExtraCost(NEW CounterCost(counter, tc)); if (target_start != string::npos && target_end != string::npos)
break; {
string target = value.substr(target_start + 1, target_end - 1 - target_start);
tc = tcf.createTargetChooser(target, c);
}
manaCost->addExtraCost(NEW CounterCost(counter, tc));
break;
} }
else if (value == "c")
{
manaCost->add(Constants::MTG_COLOR_WASTE, 1);
break;
}
break; break;
} }
default: //uncolored cost and hybrid costs and special cost default: //uncolored cost and hybrid costs and special cost