diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp index 624c65d579..1b86ce4faa 100644 --- a/apps/openmw/mwworld/scene.cpp +++ b/apps/openmw/mwworld/scene.cpp @@ -109,7 +109,6 @@ namespace MWWorld void Scene::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, bool adjustPlayerPos) { - mWorld->makeNewPlayer(); if (adjustPlayerPos) mWorld->getPlayer().setPos (position.pos[0], position.pos[1], position.pos[2]); diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 4439d4c666..a5fcfe093c 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -182,17 +182,6 @@ namespace MWWorld } - void World::makeNewPlayer(){ - bool initialCollision = bCollision; - if(bCollision) - toggleCollisionMode(); - MWRender::Player* play = &(mRendering.getPlayer()); - delete mPlayer; - mPlayer = new MWWorld::Player (play, mStore.npcs.find ("player"), *this); - mPhysics->addActor (mPlayer->getPlayer().getRefData().getHandle(), "", Ogre::Vector3 (0, 0, 0)); - if(initialCollision) - toggleCollisionMode(); - } World::~World() { diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index eef2f8da3f..db5b0b9cc9 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -221,7 +221,7 @@ namespace MWWorld /// references that are currently not in the rendered scene should be ignored. void setObjectPhysicsRotation(const std::string& handle,Ogre::Quaternion quat); void setObjectPhysicsPosition(const std::string& handle,Ogre::Vector3 vector); - void makeNewPlayer(); + }; }