mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-21 15:11:33 +00:00
Code Issues Releases Wiki Activity

Enable collisions for actor before adjusting position

Browse source 
Otherwise adjustPosition does not call traceDown and actor appears flying for
the first physics simulation.
This commit is contained in:
elsid 2022-05-24 23:25:23 +02:00
parent 617cd4ceb6
commit 85c79d382c
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwmechanics/actors.cpp
View file

@ -1596,15 +1596,6 @@ namespace MWMechanics
world->setActorCollisionMode(actor.getPtr(), false, false); world->setActorCollisionMode(actor.getPtr(), false, false);
continue; continue;
} }
else if (!isPlayer)
{
actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
if (!actor.getPositionAdjusted())
{
actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
actor.setPositionAdjusted(true);
}
}
const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead(); const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed()) if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
@ -1612,13 +1603,21 @@ namespace MWMechanics
// Handle player last, in case a cell transition occurs by casting a teleportation spell // Handle player last, in case a cell transition occurs by casting a teleportation spell
// (would invalidate the iterator) // (would invalidate the iterator)
if (actor.getPtr() == getPlayer()) if (isPlayer)
{ {
playerCharacter = &ctrl; playerCharacter = &ctrl;
continue; continue;
} }
actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished()); world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
if (!actor.getPositionAdjusted())
{
actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
actor.setPositionAdjusted(true);
}
ctrl.update(duration); ctrl.update(duration);
updateVisibility(actor.getPtr(), ctrl); updateVisibility(actor.getPtr(), ctrl);