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

J :

Browse Source 
* Fix a segfault case.
* Improve the trash system to handle several types more gracefully.
This commit is contained in:
jean.chalard
2010-06-13 14:03:02 +00:00
parent f14f56b9ce
commit 32352161cc
3 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
projects/mtg/src/GuiCombat.cpp
View File

@@ -4,6 +4,7 @@
#include "../include/GuiCombat.h"
#include "../include/AIPlayer.h"
#include "../include/GameObserver.h"
#include "../include/Trash.h"
#include "Closest.cpp"
static const float MARGIN = 70;
@@ -386,7 +387,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
AttackerDamaged* d = *it;
if (activeAtk == *it) activeAtk = NULL;
attackers.erase(it);
SAFE_DELETE(d);
trash(d);
return 1;
}
else
@@ -395,7 +396,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
{
DefenserDamaged* d = *q;
(*it)->blockers.erase(q);
SAFE_DELETE(d);
trash(d);
return 1;
}
return 0;
@@ -408,7 +409,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
{
AttackerDamaged* d = *it;
attackers.erase(it);
SAFE_DELETE(d);
trash(d);
return 1;
}
return 0;
@@ -422,7 +423,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
{
DefenserDamaged* d = *q;
(*it)->blockers.erase(q);
SAFE_DELETE(d);
trash(d);
return 1;
}
return 0;