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

Merge pull request #688 from kevlahnota/master

Browse Source 
Fix leak
This commit is contained in:
Anthony Calosa
2016-06-10 14:03:30 +08:00
committed by GitHub
parent 2244e62897 a74e543429
commit 1924ab09da
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -1535,15 +1535,13 @@ const string& MTGCardInstance::getSample()
int MTGCardInstance::stepPower(CombatStep step) int MTGCardInstance::stepPower(CombatStep step)
{ {
int damage = has(Constants::COMBATTOUGHNESS) ? toughness : power;
switch (step) switch (step)
{ {
case FIRST_STRIKE: case FIRST_STRIKE:
case END_FIRST_STRIKE: case END_FIRST_STRIKE:
if (has(Constants::FIRSTSTRIKE) || has(Constants::DOUBLESTRIKE)) if (has(Constants::FIRSTSTRIKE) || has(Constants::DOUBLESTRIKE))
if(has(Constants::COMBATTOUGHNESS)) return MAX(0, damage);
return MAX(0, toughness);
else
return MAX(0, power);
else else
return 0; return 0;
case DAMAGE: case DAMAGE:
@@ -1552,10 +1550,7 @@ int MTGCardInstance::stepPower(CombatStep step)
if (has(Constants::FIRSTSTRIKE) && !has(Constants::DOUBLESTRIKE)) if (has(Constants::FIRSTSTRIKE) && !has(Constants::DOUBLESTRIKE))
return 0; return 0;
else else
if(has(Constants::COMBATTOUGHNESS)) return MAX(0, damage);
return MAX(0, toughness);
else
return MAX(0, power);
} }
} }