const std::string* to std::string

apps/openmw/mwworld/physicssystem.cpp

@@ -25,7 +25,7 @@ namespace MWWorld
     
     }
     
-    std::vector< std::pair<const std::string*, Ogre::Vector3> > PhysicsSystem::doPhysics (float duration,
+    std::vector< std::pair<std::string, Ogre::Vector3> > PhysicsSystem::doPhysics (float duration,
         const std::vector<std::pair<std::string, Ogre::Vector3> >& 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<const std::string*, Ogre::Vector3> > response;
+        std::vector< std::pair<std::string, Ogre::Vector3> > response;
         for(std::map<std::string,OEngine::Physic::PhysicActor*>::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<const std::string*, Ogre::Vector3>(&it->first, coord));
+            response.push_back(std::pair<std::string, Ogre::Vector3>(it->first, coord));
         }
         return response;
     }

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<const std::string*, Ogre::Vector3> > doPhysics (float duration,
+            std::vector< std::pair<std::string, Ogre::Vector3> > doPhysics (float duration,
                 const std::vector<std::pair<std::string, Ogre::Vector3> >& actors);
             
             void addObject (const std::string& handle, const std::string& mesh,

apps/openmw/mwworld/world.cpp

@@ -713,10 +713,10 @@ namespace MWWorld
     void World::doPhysics (const std::vector<std::pair<std::string, Ogre::Vector3> >& actors,
         float duration)
     {
-        std::vector< std::pair<const std::string*, Ogre::Vector3> > vectors = mPhysics->doPhysics (duration, actors);
-        std::vector< std::pair<const std::string*, Ogre::Vector3> >::iterator it;
+        std::vector< std::pair<std::string, Ogre::Vector3> > vectors = mPhysics->doPhysics (duration, actors);
+        std::vector< std::pair<std::string, Ogre::Vector3> >::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);
         }
     }