mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Do not copy pointers during iteration

Browse Source
This commit is contained in:
Andrei Kortunov 2019-05-11 09:44:30 +04:00
parent 1444ef6f43
commit 9ba6f5f36c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/actors.cpp
View File

@ -470,7 +470,7 @@ namespace MWMechanics
{ {
MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2); MWBase::Environment::get().getMechanicsManager()->startCombat(actor1, actor2);
// Also have actor1's allies start combat // Also have actor1's allies start combat
for (const MWWorld::Ptr ally1 : allies1) for (const MWWorld::Ptr& ally1 : allies1)
MWBase::Environment::get().getMechanicsManager()->startCombat(ally1, actor2); MWBase::Environment::get().getMechanicsManager()->startCombat(ally1, actor2);
return; return;
} }
@ -2075,7 +2075,7 @@ namespace MWMechanics
std::vector<MWWorld::Ptr> neighbors; std::vector<MWWorld::Ptr> neighbors;
osg::Vec3f position (actor.getRefData().getPosition().asVec3()); osg::Vec3f position (actor.getRefData().getPosition().asVec3());
getObjectsInRange(position, mActorsProcessingRange, neighbors); getObjectsInRange(position, mActorsProcessingRange, neighbors);
for(const MWWorld::Ptr neighbor : neighbors) for(const MWWorld::Ptr& neighbor : neighbors)
{ {
if (neighbor == actor) if (neighbor == actor)
continue; continue;