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

Cleanup

Browse Source
This commit is contained in:
Anthony Calosa
2017-02-03 10:39:45 +08:00
parent 942c95e736
commit 9104afdef7
4 changed files with 1 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/AllAbilities.cpp
+1 -2
View File
@@ -1610,7 +1610,7 @@ int AACopier::resolve()
if(source->isACopier)
{
source->GrantedAndAbility = andAbility;
//AbilityFactory af(game);
for(unsigned int i = 0;i < source->cardsAbilities.size();i++)
{
MTGAbility * a = dynamic_cast<MTGAbility *>(source->cardsAbilities[i]);
@@ -1620,7 +1620,6 @@ int AACopier::resolve()
source->cardsAbilities.clear();
source->magicText = _target->magicText;
//af.getAbilities(&currentAbilities, NULL, source);
for (size_t i = 0; i < source->cardsAbilitiesFilter.size(); ++i)
{
MTGAbility * a = source->cardsAbilitiesFilter[i];
projects/mtg/src/GameObserver.cpp
-22
View File
@@ -710,28 +710,6 @@ void GameObserver::gameStateBasedEffects()
card->myPair->myPair = NULL;
card->myPair = NULL;
}
///set basic land mana objects canproduce
/*for (size_t gg = 0; gg < mLayers->actionLayer()->manaObjects.size(); gg++)
{
MTGAbility * aa = ((MTGAbility *) mLayers->actionLayer()->manaObjects[gg]);
//AManaProducer * amp = dynamic_cast<AManaProducer*> (aa);
if(aa != NULL)
{
if (dynamic_cast<AManaProducer*> (aa) && (dynamic_cast<AManaProducer*> (aa))->source->isLand() && (dynamic_cast<AManaProducer*> (aa))->source == card)
{
if (card->hasType("forest") && ((AManaProducer*)aa)->output->hasColor(Constants::MTG_COLOR_GREEN))
card->canproduceG = 1;
if (card->hasType("island") && ((AManaProducer*)aa)->output->hasColor(Constants::MTG_COLOR_BLUE))
card->canproduceU = 1;
if (card->hasType("mountain") && ((AManaProducer*)aa)->output->hasColor(Constants::MTG_COLOR_RED))
card->canproduceR = 1;
if (card->hasType("swamp") && ((AManaProducer*)aa)->output->hasColor(Constants::MTG_COLOR_BLACK))
card->canproduceB = 1;
if (card->hasType("plains") && ((AManaProducer*)aa)->output->hasColor(Constants::MTG_COLOR_WHITE))
card->canproduceW = 1;
}
}
}*/
///clear imprints
if(isInPlay(card) && card->imprintedCards.size())
{
projects/mtg/src/MTGCardInstance.cpp
-9
View File
@@ -151,15 +151,6 @@ void MTGCardInstance::copy(MTGCardInstance * card)
cardsAbilitiesFilter.push_back(a);
}
}
//
/*if(!isPhased)
{
Spell * spell = NEW Spell(observer, this);
observer = card->observer;
AbilityFactory af(observer);
af.addAbilities(observer->mLayers->actionLayer()->getMaxId(), spell);
delete spell;
}*/
if(observer->players[1]->playMode == Player::MODE_TEST_SUITE)
mtgid = backupid; // there must be a way to get the token id...