[wagic] r4890 committed - Refactored formatting for easier reading of the code

[wa...@googlecode.com]

Revision: 4890
Author: pankdm
Date: Fri Oct 18 06:38:03 2013 UTC
Log: Refactored formatting for easier reading of the code
http://code.google.com/p/wagic/source/detail?r=4890

Modified:
/trunk/projects/mtg/include/AllAbilities.h
/trunk/projects/mtg/src/MTGAbility.cpp
/trunk/projects/mtg/src/TargetChooser.cpp

=======================================
--- /trunk/projects/mtg/include/AllAbilities.h Fri Oct 18 06:37:09 2013 UTC
+++ /trunk/projects/mtg/include/AllAbilities.h Fri Oct 18 06:38:03 2013 UTC
@@ -910,7 +910,7 @@
WEventLife * e = dynamic_cast<WEventLife *> (event);
if (!e) return 0;
if (sourceUntapped && source->isTapped() == 1)
- return 0;
+ return 0;
if (!tc->canTarget(e->player)) return 0;
if (fromTc && !fromTc->canTarget(e->player)) return 0;
if (type == 1 && (e->amount > 0)) return 0;
=======================================
--- /trunk/projects/mtg/src/MTGAbility.cpp Fri Oct 18 06:35:52 2013 UTC
+++ /trunk/projects/mtg/src/MTGAbility.cpp Fri Oct 18 06:38:03 2013 UTC
@@ -1411,12 +1411,10 @@
}

// figure out alternative cost effects
- string keyword;
-
-
for (size_t i = 0; i <
sizeof(kAlternateCostIds)/sizeof(kAlternateCostIds[0]); ++i)
{
- if (s.find(kAlternateCostKeywords[i]) == 0)
+ const string& keyword = kAlternateCostKeywords[i];
+ if (s.find(keyword) == 0)
{
if (!(spell &&
spell->FullfilledAlternateCost(kAlternateCostIds[i])))
{
@@ -1424,7 +1422,7 @@
SAFE_DELETE(tc);
return NULL;
}
- return
parseMagicLine(s.substr(kAlternateCostKeywords[i].length()), id, spell,
card);
+ return parseMagicLine(s.substr(keyword.length()), id, spell,
card);
}
}
//if/ifnot COND then DO EFFECT.
=======================================
--- /trunk/projects/mtg/src/TargetChooser.cpp Fri Oct 18 06:37:09 2013 UTC
+++ /trunk/projects/mtg/src/TargetChooser.cpp Fri Oct 18 06:38:03 2013 UTC
@@ -1308,17 +1308,21 @@
{
}

-bool PlayerTargetChooser::canTarget(Targetable * target,bool)
+bool PlayerTargetChooser::canTarget(Targetable * target, bool)
{
- if (source && targetter && (targetter->controller() !=
targetter->controller()->opponent())
- &&
(targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::CONTROLLERSHROUD))
- && targetter->controller() != target) return false;
- if (source && targetter && (targetter->controller() ==
targetter->controller())
- &&
(targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
- && targetter->controller()->opponent() == target)
return false;
- if (source && targetter && (targetter->controller() ==
targetter->controller())
- &&
(targetter->controller()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
&& targetter->controller()
- == target) return false;
+ if (source && targetter)
+ {
+ if ((targetter->controller() !=
targetter->controller()->opponent())
+ &&
(targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::CONTROLLERSHROUD))
+ && targetter->controller() != target)
+ return false;
+ if
((targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
+ && targetter->controller()->opponent() == target)
+ return false;
+ if
((targetter->controller()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
+ && targetter->controller() == target)
+ return false;
+ }

Player * pTarget = dynamic_cast<Player *>(target);
return (pTarget && (!p || p == pTarget));
@@ -1346,15 +1350,21 @@
/*Damageable Target */
bool DamageableTargetChooser::canTarget(Targetable * target,bool
withoutProtections)
{
- if (source && targetter && (targetter->controller() !=
targetter->controller()->opponent())
- &&
(targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::CONTROLLERSHROUD))
- && targetter->controller() != target) return false;
- if (source && targetter && (targetter->controller() ==
targetter->controller())
- &&
(targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
- && targetter->controller()->opponent() == target)
return false;
- if (source && targetter && (targetter->controller() ==
targetter->controller())
- &&
(targetter->controller()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
&& targetter->controller()
- == target) return false;
+ // TODO: get rid of common code with PlayerTargetChooser
+ if (source && targetter)
+ {
+ if ((targetter->controller() !=
targetter->controller()->opponent())
+ &&
(targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::CONTROLLERSHROUD))
+ && targetter->controller() != target)
+ return false;
+ if
((targetter->controller()->opponent()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
+ && targetter->controller()->opponent() == target)
+ return false;
+ if
((targetter->controller()->game->inPlay->hasAbility(Constants::PLAYERSHROUD))
+ && targetter->controller() == target)
+ return false;
+ }
+
if (dynamic_cast<Player *>(target))
{
return true;