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

Flagged numerous peices of code that have local variables that are masking either member variables or variables scoped outside the current scope.

Browse Source 
I've marked all the ones I found with the following TODO comment:

TODO: C6246: <blah blah>

a few in particular are the ones related to "oneShot" and "_target".  These are local variables that are declared that
mask either a method parameter or a member variable.
This commit is contained in:
techdragon.nguyen@gmail.com
2011-04-21 10:04:32 +00:00
parent 8ed84aa97d
commit 8bf983e2e5
13 changed files with 70 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/ManaCost.cpp
+14 -14
View File
@@ -140,15 +140,14 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
manaCost->addExtraCost(NEW MillCost(tc));
break;
case 'n': //return unblocked attacker cost
TargetChooserFactory tcf;
tc = tcf.createTargetChooser("creature|myBattlefield", c);
manaCost->addExtraCost(NEW Ninja(tc));
break;
case 'p' :
{
SAFE_DELETE(tc);
size_t start = value.find("(");
size_t end = value.rfind(")");
start = value.find("(");
end = value.rfind(")");
string manaType = value.substr(start + 1, end - start - 1);
manaCost->addExtraCost(NEW LifeorManaCost(NULL,manaType));
break;
@@ -172,15 +171,15 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
separator2 = value.find(",", separator + 1);
}
SAFE_DELETE(tc);
size_t target_start = string::npos;
size_t targetIndexStart = string::npos;
if (separator2 != string::npos)
{
target_start = value.find(",", separator2 + 1);
targetIndexStart = value.find(",", separator2 + 1);
}
size_t target_end = counter_end;
if (target_start != string::npos && target_end != string::npos)
size_t targetIndexEnd = counter_end;
if (targetIndexStart != string::npos && targetIndexEnd != string::npos)
{
string target = value.substr(target_start + 1, target_end - 1 - target_start);
string target = value.substr(targetIndexStart + 1, targetIndexEnd - 1 - targetIndexStart);
tc = tcf.createTargetChooser(target, c);
}
manaCost->addExtraCost(NEW CounterCost(counter, tc));
@@ -195,6 +194,7 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
{
for (int i = 0; i < 2; i++)
{
// TODO: C6246: Clarify c, is this independant of the "c" declared outside this scope?
char c = value[i];
if (c >= '0' && c <= '9')
{
@@ -215,13 +215,13 @@ ManaCost * ManaCost::parseManaCost(string s, ManaCost * _manaCost, MTGCardInstan
}
if (values[0] > 0 || values[1] > 0)
manaCost->addHybrid(colors[0], values[0], colors[1], values[1]);
}
else
{
manaCost->add(Constants::MTG_COLOR_ARTIFACT, intvalue);
}
break;
}
else
{
manaCost->add(Constants::MTG_COLOR_ARTIFACT, intvalue);
}
break;
}
}
}
s = s.substr(end + 1);