mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 21:45:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'unused_param' into 'master'

Browse source 
Remove never used parameter from CharacterController::update()

See merge request OpenMW/openmw!523
This commit is contained in:
Evil Eye 2021-01-10 10:58:28 +00:00
commit e737bd00fa
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1898,7 +1898,7 @@ void CharacterController::updateAnimQueue()
mAnimation->setLoopingEnabled(mAnimQueue.front().mGroup, mAnimQueue.size() <= 1);
}
void CharacterController::update(float duration, bool animationOnly)
void CharacterController::update(float duration)
{
MWBase::World *world = MWBase::Environment::get().getWorld();
const MWWorld::Class &cls = mPtr.getClass();
@ -2386,10 +2386,10 @@ void CharacterController::update(float duration, bool animationOnly)
world->rotateObject(mPtr, rot.x(), rot.y(), 0.0f, true);
}
if (!animationOnly && !mMovementAnimationControlled)
if (!mMovementAnimationControlled)
world->queueMovement(mPtr, vec);
}
else if (!animationOnly)
else
// We must always queue movement, even if there is none, to apply gravity.
world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
@ -2414,8 +2414,7 @@ void CharacterController::update(float duration, bool animationOnly)
playDeath(1.f, mDeathState);
}
// We must always queue movement, even if there is none, to apply gravity.
if (!animationOnly)
world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));
}
bool isPersist = isPersistentAnimPlaying();
@ -2452,10 +2451,10 @@ void CharacterController::update(float duration, bool animationOnly)
{
moved.z() = 1.0;
}
}
}
// Update movement
if(!animationOnly && mMovementAnimationControlled && mPtr.getClass().isActor())
if(mMovementAnimationControlled && mPtr.getClass().isActor())
world->queueMovement(mPtr, moved);
mSkipAnim = false;

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

@ -248,7 +248,7 @@ public:
void updatePtr(const MWWorld::Ptr &ptr);
void update(float duration, bool animationOnly=false);
void update(float duration);
bool onOpen();
void onClose();