mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'seventh_time_is_the_charm' into 'master'

Browse Source 
Unbreak again NPC teleport

See merge request OpenMW/openmw!760
This commit is contained in:
Alexei Dobrohotov 2021-04-18 16:36:11 +00:00
commit b29e797b27
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwworld/worldimp.cpp
View File

@ -1258,10 +1258,9 @@ namespace MWWorld
auto* actor = mPhysics->getActor(ptr);
osg::Vec3f newpos = ptr.getRefData().getPosition().asVec3() + vec;
if (actor)
{
actor->adjustPosition(vec);
if (ptr.getClass().isActor())
return moveObject(ptr, newpos.x(), newpos.y(), newpos.z(), false, moveToActive && ptr != getPlayerPtr());
}
return moveObject(ptr, newpos.x(), newpos.y(), newpos.z());
}