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

Erwan

Browse Source 
- changed "putInPlay" to return "NULL" if the card cannot be found in the "from" zone. The behavior of the function before that prevented to see that we broke the "alternate" cost feature (see test Vine Dryad)
- Fixed some memory leaks introduced in r2922
This commit is contained in:
wagic.the.homebrew@gmail.com
2011-01-22 09:43:13 +00:00
parent 094c97dec8
commit d581a72c1d
4 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1371,6 +1371,7 @@ public:
{
if(!starfound.empty())
{
SAFE_DELETE(multiplier);
multiplier = NEW WParsedInt(starfound, NULL, (MTGCardInstance *)source);
}
for (int i = 0; i < multiplier->getValue(); ++i)
@@ -1523,17 +1524,14 @@ public:
ATokenCreator * clone() const
{
ATokenCreator * a = NEW ATokenCreator(*this);
a->multiplier = NEW WParsedInt(*(multiplier));
a->isClone = 1;
return a;
}
~ATokenCreator()
{
if (!isClone)
{
if(multiplier != NULL)
delete (multiplier);
}
SAFE_DELETE(multiplier);
}
};

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

@@ -685,15 +685,14 @@ const char * AADrawer::getMenuText()
AADrawer * AADrawer::clone() const
{
AADrawer * a = NEW AADrawer(*this);
a->nbcards = NEW WParsedInt(*(a->nbcards));
a->nbcards = NEW WParsedInt(*(this->nbcards));
a->isClone = 1;
return a;
}
AADrawer::~AADrawer()
{
if(!isClone)
SAFE_DELETE(nbcards);
SAFE_DELETE(nbcards);
}
// AAFrozen: Prevent a card from untapping during next untap phase

94
projects/mtg/src/MTGGameZones.cpp
View File

@@ -367,6 +367,8 @@ MTGCardInstance * MTGPlayerCards::putInBattlefield(MTGCardInstance * card)
return copy;
}
// Moves a card from one zone to another
// If the card is not actually in the expected "from" zone, does nothing and returns null
MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to)
{
MTGCardInstance * copy = NULL;
@@ -382,58 +384,58 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone
doCopy = 0;
}
if ((copy = from->removeCard(card, doCopy)))
if (!(copy = from->removeCard(card, doCopy)))
return NULL; //ERROR
if (options[Options::SFXVOLUME].number > 0)
{
if (options[Options::SFXVOLUME].number > 0)
if (to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard)
{
if (to == g->players[0]->game->graveyard || to == g->players[1]->game->graveyard)
if (card->isCreature())
{
if (card->isCreature())
{
JSample * sample = WResourceManager::Instance()->RetrieveSample("graveyard.wav");
if (sample)
JSoundSystem::GetInstance()->PlaySample(sample);
}
JSample * sample = WResourceManager::Instance()->RetrieveSample("graveyard.wav");
if (sample)
JSoundSystem::GetInstance()->PlaySample(sample);
}
}
MTGCardInstance * ret = copy;
to->addCard(copy);
//The "Temp" zone are purely for code purposes, and we don't want the abilities engine to
//Trigger when cards move in this zone
// Additionally, when they mve "from" this zone,
// we trick the engine into believing that they moved from the zone the card was previously in
// See http://code.google.com/p/wagic/issues/detail?id=335
{
if (to == g->players[0]->game->temp || to == g->players[1]->game->temp)
{
//don't send event when moving to temp
return ret;
}
if (from == g->players[0]->game->temp || from == g->players[1]->game->temp)
{
//remove temporary stuff
MTGCardInstance * previous = copy->previous;
MTGCardInstance * previous2 = previous->previous;
from = previous->previousZone;
copy->previous = previous2;
if (previous2)
previous2->next = copy;
previous->previous = NULL;
previous->next = NULL;
SAFE_DELETE(previous);
}
}
WEvent * e = NEW WEventZoneChange(copy, from, to);
g->receiveEvent(e);
return ret;
}
return card; //Error
MTGCardInstance * ret = copy;
to->addCard(copy);
//The "Temp" zone are purely for code purposes, and we don't want the abilities engine to
//Trigger when cards move in this zone
// Additionally, when they mve "from" this zone,
// we trick the engine into believing that they moved from the zone the card was previously in
// See http://code.google.com/p/wagic/issues/detail?id=335
{
if (to == g->players[0]->game->temp || to == g->players[1]->game->temp)
{
//don't send event when moving to temp
return ret;
}
if (from == g->players[0]->game->temp || from == g->players[1]->game->temp)
{
//remove temporary stuff
MTGCardInstance * previous = copy->previous;
MTGCardInstance * previous2 = previous->previous;
from = previous->previousZone;
copy->previous = previous2;
if (previous2)
previous2->next = copy;
previous->previous = NULL;
previous->next = NULL;
SAFE_DELETE(previous);
}
}
WEvent * e = NEW WEventZoneChange(copy, from, to);
g->receiveEvent(e);
return ret;
}
void MTGPlayerCards::discardRandom(MTGGameZone * from, MTGCardInstance * source)

5
projects/mtg/src/MTGRules.cpp
View File

@@ -1375,6 +1375,11 @@ int MTGPersistRule::receiveEvent(WEvent * event)
if (e->to == p->game->graveyard)
{
MTGCardInstance * copy = p->game->putInZone(e->card, p->game->graveyard, e->card->owner->game->stack);
if (!copy)
{
DebugTrace("MTGRULES: couldn't move card for persist");
return 0;
}
Spell * spell = NEW Spell(copy);
spell->resolve();
spell->source->counters->addCounter(-1, -1);