Small fixes (misstype, formatting, target p2)

This commit is contained in:
pankdm
2013-10-18 06:38:15 +00:00
parent 38b4213f9c
commit b5794ad328
6 changed files with 14 additions and 12 deletions
+2 -2
View File
@@ -1777,7 +1777,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
found = s.find("compare");
if (found != string::npos)
{
compareZone = true;
compareZone = true;
}
switch (i)
@@ -1810,7 +1810,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
{
result->oneShot = oneShot;
a->forcedAlive = forcedalive;
if(neverRemove)
if (neverRemove)
{
result->oneShot = false;
result->forceDestroy = -1;
+3 -3
View File
@@ -554,7 +554,7 @@ unsigned int MTGGameZone::countByCanTarget(TargetChooser * tc)
int result = 0;
for (int i = 0; i < (nb_cards); i++)
{
if (tc->canTarget(cards[i]), withoutProtections)
if (tc->canTarget(cards[i], withoutProtections))
{
result++;
}
@@ -572,7 +572,7 @@ unsigned int MTGGameZone::countTotalManaSymbols(TargetChooser * tc, int color)
int result = 0;
for (int i = 0; i < nb_cards; i++)
{
if (tc->canTarget(cards[i]), withoutProtections)
if (tc->canTarget(cards[i], withoutProtections))
{
result += cards[i]->getManaCost()->getManaSymbols(color);
}
@@ -947,7 +947,7 @@ MTGGameZone * MTGGameZone::intToZone(GameObserver *g, int zoneId, MTGCardInstanc
{
//bug or bug case default to
p2 = source->controller();
target = source;
target = source;
}
}
else
+3 -2
View File
@@ -1258,10 +1258,11 @@ bool TargetZoneChooser::targetsZone(MTGGameZone * z)
if (MTGGameZone::intToZone(Owner->getObserver(), zones[i], source) == z) return true;
return false;
}
bool TargetZoneChooser::targetsZone(MTGGameZone * z,MTGCardInstance * mSource)
{
if(mSource)
source = mSource;
if (mSource)
source = mSource;
for (int i = 0; i < nbzones; i++)
if (MTGGameZone::intToZone(source->owner->getObserver(), zones[i], source) == z) return true;
return false;