teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Get movement settings for NPCs before they are reset

Browse source
This commit is contained in:
David Cernat 2017-04-10 17:06:44 +03:00
parent 7700b82952
commit cbd2af972d
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
apps/openmw/mwmechanics/character.cpp
View file

@ -1960,7 +1960,28 @@ void CharacterController::update(float duration)
world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f)); world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
movement = vec; movement = vec;
/*
Start of tes3mp addition
Character movement setting positions get reset here, so we have to assign them to a
relevant LocalActor now
*/
if (isLocalActor)
{
localActor->direction.pos[0] = cls.getMovementSettings(mPtr).mPosition[0];
localActor->direction.pos[1] = cls.getMovementSettings(mPtr).mPosition[1];
localActor->direction.pos[2] = cls.getMovementSettings(mPtr).mPosition[2];
localActor->direction.rot[0] = cls.getMovementSettings(mPtr).mRotation[0];
localActor->direction.rot[1] = cls.getMovementSettings(mPtr).mRotation[1];
localActor->direction.rot[2] = cls.getMovementSettings(mPtr).mRotation[2];
}
/*
End of tes3mp addition
*/
cls.getMovementSettings(mPtr).mPosition[0] = cls.getMovementSettings(mPtr).mPosition[1] = 0; cls.getMovementSettings(mPtr).mPosition[0] = cls.getMovementSettings(mPtr).mPosition[1] = 0;
// Can't reset jump state (mPosition[2]) here; we don't know for sure whether the PhysicSystem will actually handle it in this frame // Can't reset jump state (mPosition[2]) here; we don't know for sure whether the PhysicSystem will actually handle it in this frame
// due to the fixed minimum timestep used for the physics update. It will be reset in PhysicSystem::move once the jump is handled. // due to the fixed minimum timestep used for the physics update. It will be reset in PhysicSystem::move once the jump is handled.
@ -2011,27 +2032,6 @@ void CharacterController::update(float duration)
if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead() && cls.canSwim(mPtr)) if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead() && cls.canSwim(mPtr))
moved.z() = 1.0; moved.z() = 1.0;
/*
Start of tes3mp addition
Save or load movement velocity based on whether this is a local or dedicated actor
*/
if (isLocalActor)
{
localActor->hasMovement = true;
localActor->movement.x = moved.x();
localActor->movement.y = moved.y();
localActor->movement.z = moved.z();
}
else if (isDedicatedActor)
{
if (dedicatedActor->hasMovement)
moved = osg::Vec3f(dedicatedActor->movement.x, dedicatedActor->movement.y, dedicatedActor->movement.z);
}
/*
End of tes3mp addition
*/
// Update movement // Update movement
if(mMovementAnimationControlled && mPtr.getClass().isActor()) if(mMovementAnimationControlled && mPtr.getClass().isActor())
world->queueMovement(mPtr, moved); world->queueMovement(mPtr, moved);