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

Fix unsafe use of BaseNode in Move script instruction

Browse Source
This commit is contained in:
scrawl 2014-12-27 17:20:37 +01:00
parent a62fe38a1b
commit 0a2dd4c6cb
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwscript/transformationextensions.cpp
View File

@ -689,7 +689,11 @@ namespace MWScript
else else
throw std::runtime_error ("invalid movement axis: " + axis); throw std::runtime_error ("invalid movement axis: " + axis);
if (!ptr.getRefData().getBaseNode())
return;
Ogre::Vector3 worldPos = ptr.getRefData().getBaseNode()->convertLocalToWorldPosition(posChange); Ogre::Vector3 worldPos = ptr.getRefData().getBaseNode()->convertLocalToWorldPosition(posChange);
dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr( dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(
MWBase::Environment::get().getWorld()->moveObject(ptr, worldPos.x, worldPos.y, worldPos.z)); MWBase::Environment::get().getWorld()->moveObject(ptr, worldPos.x, worldPos.y, worldPos.z));
} }