mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-11 00:44:33 +00:00
Code Issues Projects Releases Wiki Activity

Reversing changes

Browse Source
This commit is contained in:
Jason Hooks 2012-01-30 00:06:29 -05:00
parent d2b3c1dbac
commit 2d0e83a2cf
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwworld/scene.cpp
View File

@ -109,7 +109,6 @@ namespace MWWorld
void Scene::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, void Scene::playerCellChange (Ptr::CellStore *cell, const ESM::Position& position,
bool adjustPlayerPos) bool adjustPlayerPos)
{ {
mWorld->makeNewPlayer();
if (adjustPlayerPos) if (adjustPlayerPos)
mWorld->getPlayer().setPos (position.pos[0], position.pos[1], position.pos[2]); mWorld->getPlayer().setPos (position.pos[0], position.pos[1], position.pos[2]);

11
apps/openmw/mwworld/world.cpp
View File

@ -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() World::~World()
{ {

2
apps/openmw/mwworld/world.hpp
View File

@ -221,7 +221,7 @@ namespace MWWorld
/// references that are currently not in the rendered scene should be ignored. /// references that are currently not in the rendered scene should be ignored.
void setObjectPhysicsRotation(const std::string& handle,Ogre::Quaternion quat); void setObjectPhysicsRotation(const std::string& handle,Ogre::Quaternion quat);
void setObjectPhysicsPosition(const std::string& handle,Ogre::Vector3 vector); void setObjectPhysicsPosition(const std::string& handle,Ogre::Vector3 vector);
void makeNewPlayer();
}; };
} }