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

Call getUserPointer only for not nullptr collision object

Browse Source 
nullptr can't have user pointer anyway so it saves a lookup in the
unordered_map.
This commit is contained in:
elsid 2024-04-26 15:31:29 +02:00
parent 5f926bd129
commit acf1e51a28
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/openmw/mwphysics/mtphysics.cpp
View File

@ -275,10 +275,13 @@ namespace
if (mAdvanceSimulation) if (mAdvanceSimulation)
{ {
MWWorld::Ptr standingOn; MWWorld::Ptr standingOn;
auto* ptrHolder if (frameData.mStandingOn != nullptr)
= static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn)); {
if (ptrHolder) auto* const ptrHolder
standingOn = ptrHolder->getPtr(); = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
if (ptrHolder != nullptr)
standingOn = ptrHolder->getPtr();
}
actor->setStandingOnPtr(standingOn); actor->setStandingOnPtr(standingOn);
// the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the
// change // change