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

corrections

Browse Source
This commit is contained in:
Anthony Calosa
2017-02-03 14:26:26 +08:00
parent 9104afdef7
commit 3fa52e7ac5
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/include/AllAbilities.h
View File

@@ -2045,6 +2045,7 @@ class AACopier: public ActivatedAbility
{ {
public: public:
bool isactivated; bool isactivated;
vector<MTGAbility *> currentAbilities;
MTGAbility * andAbility; MTGAbility * andAbility;
AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL); AACopier(GameObserver* observer, int _id, MTGCardInstance * _source, MTGCardInstance * _target = NULL, ManaCost * _cost = NULL);
int resolve(); int resolve();

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

@@ -1610,7 +1610,7 @@ int AACopier::resolve()
if(source->isACopier) if(source->isACopier)
{ {
source->GrantedAndAbility = andAbility; source->GrantedAndAbility = andAbility;
AbilityFactory af(game);
for(unsigned int i = 0;i < source->cardsAbilities.size();i++) for(unsigned int i = 0;i < source->cardsAbilities.size();i++)
{ {
MTGAbility * a = dynamic_cast<MTGAbility *>(source->cardsAbilities[i]); MTGAbility * a = dynamic_cast<MTGAbility *>(source->cardsAbilities[i]);
@@ -1620,9 +1620,10 @@ int AACopier::resolve()
source->cardsAbilities.clear(); source->cardsAbilities.clear();
source->magicText = _target->magicText; source->magicText = _target->magicText;
for (size_t i = 0; i < source->cardsAbilitiesFilter.size(); ++i) af.getAbilities(&currentAbilities, NULL, source);
for (size_t i = 0; i < currentAbilities.size(); ++i)
{ {
MTGAbility * a = source->cardsAbilitiesFilter[i]; MTGAbility * a = currentAbilities[i];
a->source = (MTGCardInstance *) source; a->source = (MTGCardInstance *) source;
if (a) if (a)
{ {