diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp index 55b6e532c..e9a270c53 100644 --- a/apps/openmw/mwworld/physicssystem.cpp +++ b/apps/openmw/mwworld/physicssystem.cpp @@ -25,7 +25,7 @@ namespace MWWorld } - std::vector< std::pair > PhysicsSystem::doPhysics (float duration, + std::vector< std::pair > PhysicsSystem::doPhysics (float duration, const std::vector >& actors) { // stop changes to world from being reported back to the physics system @@ -71,13 +71,13 @@ namespace MWWorld } mEngine->stepSimulation(duration); - std::vector< std::pair > response; + std::vector< std::pair > response; for(std::map::iterator it = mEngine->PhysicActorMap.begin(); it != mEngine->PhysicActorMap.end();it++) { btVector3 newPos = it->second->getPosition(); Ogre::Vector3 coord(newPos.x(), newPos.y(), newPos.z()); - response.push_back(std::pair(&it->first, coord)); + response.push_back(std::pair(it->first, coord)); } return response; } diff --git a/apps/openmw/mwworld/physicssystem.hpp b/apps/openmw/mwworld/physicssystem.hpp index fde3162ea..57e3f363d 100644 --- a/apps/openmw/mwworld/physicssystem.hpp +++ b/apps/openmw/mwworld/physicssystem.hpp @@ -14,7 +14,7 @@ namespace MWWorld PhysicsSystem (OEngine::Render::OgreRenderer &_rend , OEngine::Physic::PhysicEngine* physEng); ~PhysicsSystem (); - std::vector< std::pair > doPhysics (float duration, + std::vector< std::pair > doPhysics (float duration, const std::vector >& actors); void addObject (const std::string& handle, const std::string& mesh, diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 02d0d0d5c..1a424d7c8 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -713,10 +713,10 @@ namespace MWWorld void World::doPhysics (const std::vector >& actors, float duration) { - std::vector< std::pair > vectors = mPhysics->doPhysics (duration, actors); - std::vector< std::pair >::iterator it; + std::vector< std::pair > vectors = mPhysics->doPhysics (duration, actors); + std::vector< std::pair >::iterator it; for(it = vectors.begin(); it != vectors.end(); it++) { - MWWorld::Ptr ptr = getPtrViaHandle (*it->first); + MWWorld::Ptr ptr = getPtrViaHandle (it->first); moveObject (ptr, it->second.x, it->second.y, it->second.z); } }