mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2375 from akortunov/warnfix

Browse Source 
Do not copy pointers during iteration
This commit is contained in:
Alexei Dobrohotov 2019-05-11 14:10:01 +03:00 committed by GitHub
commit 0cea76c684
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
// 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);
return;
}
@ -2075,7 +2075,7 @@ namespace MWMechanics
std::vector<MWWorld::Ptr> neighbors;
osg::Vec3f position (actor.getRefData().getPosition().asVec3());
getObjectsInRange(position, mActorsProcessingRange, neighbors);
for(const MWWorld::Ptr neighbor : neighbors)
for(const MWWorld::Ptr& neighbor : neighbors)
{
if (neighbor == actor)
continue;