Skip to content

Commit a3ae61d

Browse files
Maullerhelmutbuhler
authored andcommitted
[GEN][ZH] Fix projectileHandleCollision iterator usage in DumbProjectileBehavior to conform to STL (#728)
Co-authored-by: Helmut Buhler <[email protected]>
1 parent 700fa4e commit a3ae61d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
487487
const ContainedItemsList* items = contain->getContainedItemsList();
488488
if (items)
489489
{
490-
for (ContainedItemsList::const_iterator it = items->begin(); *it != NULL && numKilled < d->m_garrisonHitKillCount; )
490+
for (ContainedItemsList::const_iterator it = items->begin(); it != items->end() && numKilled < d->m_garrisonHitKillCount; )
491491
{
492492
Object* thingToKill = *it++;
493493
if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/DumbProjectileBehavior.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ Bool DumbProjectileBehavior::projectileHandleCollision( Object *other )
490490
const ContainedItemsList* items = contain->getContainedItemsList();
491491
if (items)
492492
{
493-
for (ContainedItemsList::const_iterator it = items->begin(); *it != NULL && numKilled < d->m_garrisonHitKillCount; )
493+
for (ContainedItemsList::const_iterator it = items->begin(); it != items->end() && numKilled < d->m_garrisonHitKillCount; )
494494
{
495495
Object* thingToKill = *it++;
496496
if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))

0 commit comments

Comments
 (0)