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

J :

Browse Source 
* Fix a little memory leak.
This commit is contained in:
jean.chalard
2009-09-07 17:18:46 +00:00
parent e7fb9282ce
commit ea92876d7b
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GuiCombat.cpp
+3 -8
View File
@@ -282,14 +282,12 @@ int GuiCombat::receiveEventPlus(WEvent* e)
if (WEventCreatureAttacker* event = dynamic_cast<WEventCreatureAttacker*>(e)) if (WEventCreatureAttacker* event = dynamic_cast<WEventCreatureAttacker*>(e))
{ {
if (NULL == event->after) return 0; if (NULL == event->after) return 0;
cout << "Attacker : " << event->card->name << " " << event->before << " -> " << event->after << endl;
AttackerDamaged* t = NEW AttackerDamaged(event->card, *(event->card->view), true, NULL); AttackerDamaged* t = NEW AttackerDamaged(event->card, *(event->card->view), true, NULL);
attackers.push_back(t); attackers.push_back(t);
return 1; return 1;
} }
else if (WEventCreatureBlocker* event = dynamic_cast<WEventCreatureBlocker*>(e)) else if (WEventCreatureBlocker* event = dynamic_cast<WEventCreatureBlocker*>(e))
{ {
cout << "Blocker : " << event->card->name << " " << event->before << " -> " << event->after << endl;
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it) for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
if ((*it)->card == event->after) if ((*it)->card == event->after)
{ {
@@ -302,7 +300,6 @@ int GuiCombat::receiveEventPlus(WEvent* e)
} }
else if (WEventCreatureBlockerRank* event = dynamic_cast<WEventCreatureBlockerRank*>(e)) else if (WEventCreatureBlockerRank* event = dynamic_cast<WEventCreatureBlockerRank*>(e))
{ {
cout << "Order : " << event->card->name << " -> " << event->exchangeWith->name << endl;
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it) for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
if ((*it)->card == event->attacker) if ((*it)->card == event->attacker)
{ {
@@ -331,6 +328,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
{ {
AttackerDamaged* d = *it; AttackerDamaged* d = *it;
if (activeAtk == *it) activeAtk = NULL; if (activeAtk == *it) activeAtk = NULL;
for (vector<DefenserDamaged*>::iterator q = (*it)->blockers.begin(); q != (*it)->blockers.end(); ++q) delete(*q);
attackers.erase(it); attackers.erase(it);
SAFE_DELETE(d); SAFE_DELETE(d);
return 1; return 1;
@@ -426,14 +424,11 @@ int GuiCombat::receiveEventMinus(WEvent* e)
if (0 == resolve()) if (0 == resolve())
go->nextCombatStep(); go->nextCombatStep();
else else
{ go->mLayers->stackLayer()->AddNextGamePhase();
cout << "ASK INTERRUPT" << endl;
go->mLayers->stackLayer()->AddNextGamePhase();
}
return 1; return 1;
case DAMAGE: DAMAGE: case DAMAGE: DAMAGE:
step = event->step; step = event->step;
if (!go->currentPlayer->displayStack()) { cout << "DAMAGE" << endl; resolve(); go->userRequestNextGamePhase(); return 1; } if (!go->currentPlayer->displayStack()) { resolve(); go->userRequestNextGamePhase(); return 1; }
for (inner_iterator attacker = attackers.begin(); attacker != attackers.end(); ++attacker) for (inner_iterator attacker = attackers.begin(); attacker != attackers.end(); ++attacker)
autoaffectDamage(*attacker, step); autoaffectDamage(*attacker, step);
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it) for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)