Call getUserPointer only for not nullptr collision object

nullptr can't have user pointer anyway so it saves a lookup in the unordered_map.
3 weeks ago · acf1e51a28
parent 5f926bd129
commit acf1e51a28
1 changed files with 7 additions and 4 deletions
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@ -275,10 +275,13 @@ namespace
                if (mAdvanceSimulation)
                {
                    MWWorld::Ptr standingOn;
-                    auto* ptrHolder
-                        = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
-                    if (ptrHolder)
-                        standingOn = ptrHolder->getPtr();
+                    if (frameData.mStandingOn != nullptr)
+                    {
+                        auto* const ptrHolder
+                            = static_cast<MWPhysics::PtrHolder*>(scheduler->getUserPointer(frameData.mStandingOn));
+                        if (ptrHolder != nullptr)
+                            standingOn = ptrHolder->getPtr();
+                    }
                    actor->setStandingOnPtr(standingOn);
                    // the "on ground" state of an actor might have been updated by a traceDown, don't overwrite the
                    // change