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

Minor refactor of AACloner::resolve() - two code paths were complete duplicates except for the MTGCard*.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-11-02 09:26:37 +00:00
parent eef54c259b
commit 685626128a
2 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+27 -48
View File
@@ -787,54 +787,33 @@ public:
}
int resolve(){
MTGCardInstance * _target = (MTGCardInstance *) target;
if(_target && !_target->isToken){
MTGCardInstance * myClone;
MTGCard * clone = GameApp::collection->getCardById(_target->getId());
myClone = NULL;
if(who != 1) myClone = NEW MTGCardInstance(clone,source->controller()->game);
if(who == 1) myClone = NEW MTGCardInstance(clone,source->controller()->opponent()->game);
if(who != 1) source->controller()->game->temp->addCard(myClone);
else source->controller()->opponent()->game->temp->addCard(myClone);
Spell * spell = NEW Spell(myClone);
spell->resolve();
spell->source->isToken = 1;
spell->source->fresh = 1;
list<int>::iterator it;
for ( it=awith.begin() ; it != awith.end(); it++ ){
spell->source->basicAbilities[*it] = 1;
}
for ( it=colors.begin() ; it != colors.end(); it++ ){
spell->source->setColor(*it);
}
delete spell;
return 1;
}
if(_target && _target->isToken){
MTGCardInstance * myClone;
MTGCardInstance * clone = _target;
myClone = NULL;
if(who != 1) myClone = NEW MTGCardInstance(clone,source->controller()->game);
if(who == 1) myClone = NEW MTGCardInstance(clone,source->controller()->opponent()->game);
if(who != 1) source->controller()->game->temp->addCard(myClone);
else source->controller()->opponent()->game->temp->addCard(myClone);
Spell * spell = NEW Spell(myClone);
spell->resolve();
spell->source->isToken = 1;
spell->source->fresh = 1;
list<int>::iterator it;
for ( it=awith.begin() ; it != awith.end(); it++ ){
spell->source->basicAbilities[*it] = 1;
}
for ( it=colors.begin() ; it != colors.end(); it++ ){
spell->source->setColor(*it);
}
delete spell;
return 1;
}
return 0;
}
int resolve(){
MTGCardInstance * _target = (MTGCardInstance *) target;
if(_target)
{
MTGCardInstance * myClone = NULL;
MTGCard* clone = (_target->isToken ? _target : GameApp::collection->getCardById(_target->getId()));
if(who != 1) myClone = NEW MTGCardInstance(clone,source->controller()->game);
if(who == 1) myClone = NEW MTGCardInstance(clone,source->controller()->opponent()->game);
if(who != 1) source->controller()->game->temp->addCard(myClone);
else source->controller()->opponent()->game->temp->addCard(myClone);
Spell * spell = NEW Spell(myClone);
spell->resolve();
spell->source->isToken = 1;
spell->source->fresh = 1;
list<int>::iterator it;
for ( it=awith.begin() ; it != awith.end(); it++ ){
spell->source->basicAbilities[*it] = 1;
}
for ( it=colors.begin() ; it != colors.end(); it++ ){
spell->source->setColor(*it);
}
delete spell;
return 1;
}
return 0;
}
const char * getMenuText(){
if(who == 1) return "Clone For Opponent";