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

corrected an issue with types when not assigning colors using transforms

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2010-08-18 13:57:56 +00:00
parent eac8afbfb8
commit 5ef6091ca6
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/AllAbilities.h
+4 -8
View File
@@ -2520,15 +2520,14 @@ public:
} }
int addToGame(){ int addToGame(){
MTGCardInstance * _target = (MTGCardInstance *)target; MTGCardInstance * _target = (MTGCardInstance *)target;
while (_target->next) _target=_target->next;
for (int j = 0; j < Constants::MTG_NB_COLORS; j++){ for (int j = 0; j < Constants::MTG_NB_COLORS; j++){
if (_target->hasColor(j)) if (_target->hasColor(j))
oldcolors.push_back(j); oldcolors.push_back(j);
_target->removeColor(j); }
}
list<int>::iterator it; list<int>::iterator it;
for( it=colors.begin(); it != colors.end();it++){ _target->setColor(0,1);}
for ( it=types.begin() ; it != types.end(); it++ ){_target->addType(*it);} for ( it=types.begin() ; it != types.end(); it++ ){_target->addType(*it);}
for ( it=colors.begin() ; it != colors.end(); it++ ){_target->setColor(*it);} for ( it=colors.begin(); it != colors.end(); it++){_target->setColor(*it);}
for ( it=abilities.begin() ; it != abilities.end(); it++ ){_target->basicAbilities[*it]++;} for ( it=abilities.begin() ; it != abilities.end(); it++ ){_target->basicAbilities[*it]++;}
for ( it=oldcolors.begin() ; it != oldcolors.end(); it++ ){} for ( it=oldcolors.begin() ; it != oldcolors.end(); it++ ){}
return MTGAbility::addToGame();} return MTGAbility::addToGame();}
@@ -2597,11 +2596,8 @@ public:
} }
int addToGame(){ int addToGame(){
MTGCardInstance * _target = (MTGCardInstance *)target; MTGCardInstance * _target = (MTGCardInstance *)target;
for (int j = 0; j < Constants::MTG_NB_COLORS; j++){
if (_target->hasColor(j))
_target->removeColor(j);
}
list<int>::iterator it; list<int>::iterator it;
for( it=colors.begin(); it != colors.end();it++){ _target->setColor(0,1);}
for ( it=types.begin() ; it != types.end(); it++ ){_target->addType(*it);} for ( it=types.begin() ; it != types.end(); it++ ){_target->addType(*it);}
for ( it=colors.begin() ; it != colors.end(); it++ ){_target->setColor(*it);} for ( it=colors.begin() ; it != colors.end(); it++ ){_target->setColor(*it);}
for ( it=abilities.begin() ; it != abilities.end(); it++ ){_target->basicAbilities[*it]++;} for ( it=abilities.begin() ; it != abilities.end(); it++ ){_target->basicAbilities[*it]++;}