Skip to content

Commit 700fa4e

Browse files
Maullerhelmutbuhler
authored andcommitted
[GEN][ZH] Fix projectileHandleCollision iterator usage in MissileAIUpdate to conform to STL (#728)
Co-authored-by: Helmut Buhler <buhler@8gadgetpack.net>
1 parent 5005ed3 commit 700fa4e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Generals/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
338338
const ContainedItemsList* items = contain->getContainedItemsList();
339339
if (items)
340340
{
341-
for (ContainedItemsList::const_iterator it = items->begin(); *it != NULL && numKilled < d->m_garrisonHitKillCount; )
341+
for (ContainedItemsList::const_iterator it = items->begin(); it != items->end() && numKilled < d->m_garrisonHitKillCount; )
342342
{
343343
Object* thingToKill = *it++;
344344
if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ Bool MissileAIUpdate::projectileHandleCollision( Object *other )
348348
const ContainedItemsList* items = contain->getContainedItemsList();
349349
if (items)
350350
{
351-
for (ContainedItemsList::const_iterator it = items->begin(); *it != NULL && numKilled < d->m_garrisonHitKillCount; )
351+
for (ContainedItemsList::const_iterator it = items->begin(); it != items->end() && numKilled < d->m_garrisonHitKillCount; )
352352
{
353353
Object* thingToKill = *it++;
354354
if (!thingToKill->isEffectivelyDead() && thingToKill->isKindOfMulti(d->m_garrisonHitKillKindof, d->m_garrisonHitKillKindofNot))

0 commit comments

Comments
 (0)