mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 12:39:42 +00:00
Code Issues Releases Wiki Activity

Fix being able to move slowly when over encumbered

Browse source
This commit is contained in:
scrawl 2013-05-31 04:08:44 +02:00
parent dc17fa1636
commit 8bd712cc95
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -461,15 +461,18 @@ void CharacterController::update(float duration, Movement &movement)
Ogre::Vector3 moved = mAnimation->runAnimation(duration); Ogre::Vector3 moved = mAnimation->runAnimation(duration);
// Ensure we're moving in generally the right direction // Ensure we're moving in generally the right direction
if((movement.mPosition[0] < 0.0f && movement.mPosition[0] < moved.x*2.0f) || if (speed > 0.f)
(movement.mPosition[0] > 0.0f && movement.mPosition[0] > moved.x*2.0f)) {
moved.x = movement.mPosition[0]; if((movement.mPosition[0] < 0.0f && movement.mPosition[0] < moved.x*2.0f) ||
if((movement.mPosition[1] < 0.0f && movement.mPosition[1] < moved.y*2.0f) || (movement.mPosition[0] > 0.0f && movement.mPosition[0] > moved.x*2.0f))
(movement.mPosition[1] > 0.0f && movement.mPosition[1] > moved.y*2.0f)) moved.x = movement.mPosition[0];
moved.y = movement.mPosition[1]; if((movement.mPosition[1] < 0.0f && movement.mPosition[1] < moved.y*2.0f) ||
if((movement.mPosition[2] < 0.0f && movement.mPosition[2] < moved.z*2.0f) || (movement.mPosition[1] > 0.0f && movement.mPosition[1] > moved.y*2.0f))
(movement.mPosition[2] > 0.0f && movement.mPosition[2] > moved.z*2.0f)) moved.y = movement.mPosition[1];
moved.z = movement.mPosition[2]; if((movement.mPosition[2] < 0.0f && movement.mPosition[2] < moved.z*2.0f) ||
(movement.mPosition[2] > 0.0f && movement.mPosition[2] > moved.z*2.0f))
moved.z = movement.mPosition[2];
}
movement.mPosition[0] = moved.x; movement.mPosition[0] = moved.x;
movement.mPosition[1] = moved.y; movement.mPosition[1] = moved.y;