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

Merge branch 'destination_nullptr' into 'master'

Browse Source 
Make sure adjustPosition() is safe to call for any actor

Closes #5742

See merge request OpenMW/openmw!464
This commit is contained in:
Frederic Chardon 2020-12-14 08:03:46 +00:00
commit 2373f07168
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1345,7 +1345,11 @@ namespace MWWorld
moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z()); moveObject(ptr, ptr.getCell(), pos.x(), pos.y(), pos.z());
if (ptr.getClass().isActor()) if (ptr.getClass().isActor())
mPhysics->getActor(ptr)->resetPosition(); {
MWPhysics::Actor* actor = mPhysics->getActor(ptr);
if (actor)
actor->resetPosition();
}
} }
void World::fixPosition() void World::fixPosition()