1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-21 05:44:06 +00:00

Merge branch 'lifetime' into 'master'

Maybe fix #6071

Closes #6071

See merge request OpenMW/openmw!1010

(cherry picked from commit 64750820957773a00d449d29551bb15fbf5fe08b)

1650dabe Assign the return value of weak_ptr::lock() to a variable, so that the
This commit is contained in:
psi29a 2021-07-12 14:11:14 +00:00
parent 8530bc5cf5
commit d1c0cfa524

View file

@ -599,7 +599,7 @@ namespace MWPhysics
if (!mRemainingSteps) if (!mRemainingSteps)
return; return;
for (auto& data : mActorsFrameData) for (auto& data : mActorsFrameData)
if (data.mActor.lock()) if (const auto actor = data.mActor.lock())
{ {
std::unique_lock lock(mCollisionWorldMutex); std::unique_lock lock(mCollisionWorldMutex);
MovementSolver::unstuck(data, mCollisionWorld); MovementSolver::unstuck(data, mCollisionWorld);