mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 06:23:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_falling' into 'master'

Browse source 
Resolve #5895 by checking that the player is not on the ground

Closes #5895

See merge request OpenMW/openmw!651
This commit is contained in:
psi29a 2021-03-14 21:57:35 +00:00
commit 9d5ec7624e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwworld/scene.cpp
View file

@ -447,11 +447,17 @@ namespace MWWorld
mPhysics->disableWater(); mPhysics->disableWater();
const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr(); const auto player = MWBase::Environment::get().getWorld()->getPlayerPtr();
// By default the player is grounded, with the scene fully loaded, we validate and correct this.
if (player.mCell == cell) // Only run once, during initial cell load.
{
mPhysics->traceDown(player, player.getRefData().getPosition().asVec3(), 10.f);
}
navigator->update(player.getRefData().getPosition().asVec3()); navigator->update(player.getRefData().getPosition().asVec3());
if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx)) if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
{ {
mRendering.configureAmbient(cell->getCell()); mRendering.configureAmbient(cell->getCell());
} }
} }