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

Erwan

Browse Source 
- moved all "loseLife/gainLife" duplicated code into 1 Player method
This commit is contained in:
wagic.the.homebrew@gmail.com
2011-01-23 06:59:00 +00:00
parent 14f2e9b0f2
commit f63aa379e7
9 changed files with 88 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
projects/mtg/src/AllAbilities.cpp
View File

@@ -1254,25 +1254,19 @@ ActivatedAbilityTP(_id, card, _target, _cost, _tap, who),life_s(life_s), life(li
}
int AALifer::resolve()
{
RefreshedLife = NEW WParsedInt(life_s, NULL, source);
{
Damageable * _target = (Damageable *) getTarget();
if (_target)
if (!_target)
return 0;
RefreshedLife = NEW WParsedInt(life_s, NULL, source);
if (_target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
{
if (_target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
{
_target = ((MTGCardInstance *) _target)->controller();
}
Player *player = (Player*)_target;
player->thatmuch = abs(RefreshedLife->getValue());
WEvent * lifed = NULL;
lifed = NEW WEventLife(player,RefreshedLife->getValue());
GameObserver * game = GameObserver::GetInstance();
game->receiveEvent(lifed);
_target->life += RefreshedLife->getValue();
if(life->getValue() < 0)
_target->lifeLostThisTurn += abs(RefreshedLife->getValue());
_target = ((MTGCardInstance *) _target)->controller();
}
Player *player = (Player*)_target;
player->gainOrLoseLife(RefreshedLife->getValue());
delete RefreshedLife;
return 1;
}
@@ -1307,30 +1301,23 @@ AALifeSet::AALifeSet(int _id, MTGCardInstance * _source, Targetable * _target, W
int AALifeSet::resolve()
{
Damageable * _target = (Damageable *) getTarget();
if (_target)
{
if (_target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
{
_target = ((MTGCardInstance *) _target)->controller();
}
if (!_target)
return 0;
int lifeDiff = life->getValue() - _target->life ;
WEvent * lifed = NULL;
if(lifeDiff < 0)
{
_target->lifeLostThisTurn += abs(lifeDiff);
lifed = NEW WEventLife((Player*)_target,lifeDiff,1);
}
else
{
lifed = NEW WEventLife((Player*)_target,lifeDiff,0);
}
_target->thatmuch = abs(lifeDiff);
GameObserver * game = GameObserver::GetInstance();
game->receiveEvent(lifed);
_target->life = life->getValue();
Player * p = NULL;
if (_target->type_as_damageable == DAMAGEABLE_MTGCARDINSTANCE)
{
p = ((MTGCardInstance *) _target)->controller();
}
return 0;
else
{
p = (Player*)_target;
}
int lifeDiff = life->getValue() - p->life ;
p->gainOrLoseLife(lifeDiff);
return 1;
}
const char * AALifeSet::getMenuText()