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

Support absence of player and other actors in physics system

Browse Source
This commit is contained in:
elsid 2023-02-08 02:28:59 +01:00
parent 76dfb1b1b4
commit 36b33cc1a5
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -822,7 +822,8 @@ namespace MWPhysics
// copy new ptr position in temporary vector. player is handled separately as its movement might change active
// cell.
mActorsPositions.clear();
mActorsPositions.reserve(mActors.size() - 1);
if (!mActors.empty())
mActorsPositions.reserve(mActors.size() - 1);
for (const auto& [ptr, physicActor] : mActors)
{
if (physicActor.get() == player)
@ -833,7 +834,8 @@ namespace MWPhysics
for (const auto& [ptr, pos] : mActorsPositions)
world->moveObject(ptr, pos, false, false);
world->moveObject(player->getPtr(), player->getSimulationPosition(), false, false);
if (player != nullptr)
world->moveObject(player->getPtr(), player->getSimulationPosition(), false, false);
}
void PhysicsSystem::updateAnimatedCollisionShape(const MWWorld::Ptr& object)