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

Float to surface fix

Browse source
This commit is contained in:
scrawl 2016-06-15 19:38:04 +02:00
parent b5cb11ff07
commit 693d3cea4a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1938,7 +1938,7 @@ void CharacterController::update(float duration)
if (mSkipAnim)
mAnimation->updateEffects(duration);
if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead())
if (mFloatToSurface && cls.isActor() && cls.getCreatureStats(mPtr).isDead() && cls.canSwim(mPtr))
moved.z() = 1.0;
// Update movement

4
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -280,9 +280,9 @@ namespace MWPhysics
{
velocity = (osg::Quat(refpos.rot[2], osg::Vec3f(0, 0, -1))) * movement;
if (velocity.z() > 0.f)
if (velocity.z() > 0.f && physicActor->getOnGround())
inertia = velocity;
if(!physicActor->getOnGround())
else if(!physicActor->getOnGround())
{
velocity = velocity + physicActor->getInertialForce();
}