Fixed issue 551, "this vector contains over 1 million members" crash.
Thanks to Mike for helping me with the repro & debug session on his machine.
This commit is contained in:
@@ -580,7 +580,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
|
|||||||
(*it)->show = (1 < (*it)->blockers.size());
|
(*it)->show = (1 < (*it)->blockers.size());
|
||||||
autoaffectDamage(*it, DAMAGE);
|
autoaffectDamage(*it, DAMAGE);
|
||||||
}
|
}
|
||||||
active = NULL;
|
active = activeAtk = NULL;
|
||||||
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
|
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
|
||||||
if ((*it)->show)
|
if ((*it)->show)
|
||||||
{
|
{
|
||||||
@@ -633,7 +633,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
|
|||||||
== step))) && (((*it)->card->has(Constants::TRAMPLE) ? (size_t) 0 : (size_t) 1)
|
== step))) && (((*it)->card->has(Constants::TRAMPLE) ? (size_t) 0 : (size_t) 1)
|
||||||
< (*it)->blockers.size());
|
< (*it)->blockers.size());
|
||||||
repos<AttackerDamaged> (attackers.begin(), attackers.end(), 0);
|
repos<AttackerDamaged> (attackers.begin(), attackers.end(), 0);
|
||||||
active = NULL;
|
active = activeAtk = NULL;
|
||||||
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
|
for (inner_iterator it = attackers.begin(); it != attackers.end(); ++it)
|
||||||
if ((*it)->show)
|
if ((*it)->show)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user