Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-02 06:47:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Restore cell changes

Browse source
This commit is contained in:
scrawl 2015-05-24 01:32:00 +02:00
parent 152d690a7a
commit 9a0db5d55a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwworld/worldimp.cpp
View file

@ -1128,7 +1128,7 @@ namespace MWWorld
ptr.getRefData().setPosition(pos); ptr.getRefData().setPosition(pos);
Ogre::Vector3 vec(x, y, z); osg::Vec3f vec(x, y, z);
CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL; // currCell == NULL should only happen for player, during initial startup CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL; // currCell == NULL should only happen for player, during initial startup
bool isPlayer = ptr == mPlayer->getPlayer(); bool isPlayer = ptr == mPlayer->getPlayer();
@ -1207,12 +1207,12 @@ namespace MWWorld
} }
if (haveToMove && newPtr.getRefData().getBaseNode()) if (haveToMove && newPtr.getRefData().getBaseNode())
{ {
mRendering->moveObject(newPtr, osg::Vec3f(vec.x, vec.y, vec.z)); mRendering->moveObject(newPtr, vec);
mPhysics->updatePosition(newPtr); mPhysics->updatePosition(newPtr);
} }
if (isPlayer) if (isPlayer)
{ {
//mWorldScene->playerMoved (vec); mWorldScene->playerMoved(vec);
} }
return newPtr; return newPtr;
} }