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

Make flying creatures fall when paralyzed (Fixes #1494)

Browse source
This commit is contained in:
scrawl 2014-06-26 17:26:33 +02:00
parent 865f4648b0
commit 9eb8addc70
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1395,6 +1395,9 @@ void CharacterController::update(float duration)
if (mMovementAnimVelocity == 0) if (mMovementAnimVelocity == 0)
world->queueMovement(mPtr, vec); world->queueMovement(mPtr, vec);
} }
else
// We must always queue movement, even if there is none, to apply gravity.
world->queueMovement(mPtr, Ogre::Vector3(0.0f));
movement = vec; movement = vec;
cls.getMovementSettings(mPtr).mPosition[0] = cls.getMovementSettings(mPtr).mPosition[1] = cls.getMovementSettings(mPtr).mPosition[2] = 0; cls.getMovementSettings(mPtr).mPosition[0] = cls.getMovementSettings(mPtr).mPosition[1] = cls.getMovementSettings(mPtr).mPosition[2] = 0;

6
apps/openmw/mwworld/worldimp.cpp
View file

@ -1764,6 +1764,9 @@ namespace MWWorld
bool bool
World::isFlying(const MWWorld::Ptr &ptr) const World::isFlying(const MWWorld::Ptr &ptr) const
{ {
const MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
bool isParalyzed = (stats.getMagicEffects().get(ESM::MagicEffect::Paralyze).mMagnitude > 0);
if(!ptr.getClass().isActor()) if(!ptr.getClass().isActor())
return false; return false;
@ -1771,9 +1774,8 @@ namespace MWWorld
return false; return false;
if (ptr.getClass().canFly(ptr)) if (ptr.getClass().canFly(ptr))
return true; return !isParalyzed;
const MWMechanics::CreatureStats &stats = ptr.getClass().getCreatureStats(ptr);
if(stats.getMagicEffects().get(ESM::MagicEffect::Levitate).mMagnitude > 0 if(stats.getMagicEffects().get(ESM::MagicEffect::Levitate).mMagnitude > 0
&& isLevitationEnabled()) && isLevitationEnabled())
return true; return true;