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

Merge remote-tracking branch 'scrawl/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-03-22 09:54:42 +01:00
commit 4d80bc009a
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/view/render/previewwidget.cpp
View file

@ -2,6 +2,7 @@
#include "previewwidget.hpp" #include "previewwidget.hpp"
#include <OgreSceneManager.h> #include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include "../../model/world/data.hpp" #include "../../model/world/data.hpp"
#include "../../model/world/idtable.hpp" #include "../../model/world/idtable.hpp"

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

@ -1245,13 +1245,9 @@ void CharacterController::update(float duration)
else //avoid z-rotating for knockdown else //avoid z-rotating for knockdown
world->rotateObject(mPtr, rot.x, rot.y, 0.0f, true); world->rotateObject(mPtr, rot.x, rot.y, 0.0f, true);
// always control actual movement by animation unless this: if (mMovementAnimVelocity == 0)
// FIXME: actor falling/landing should be controlled by physics engine
if(mMovementAnimVelocity == 0.0f && (vec.length() > 0.0f || mJumpState != JumpState_None))
{
world->queueMovement(mPtr, vec); world->queueMovement(mPtr, vec);
} }
}
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;
@ -1290,7 +1286,7 @@ void CharacterController::update(float duration)
} }
// Update movement // Update movement
if(moved.squaredLength() > 1.0f) if(mMovementAnimVelocity > 0)
world->queueMovement(mPtr, moved); world->queueMovement(mPtr, moved);
} }
mSkipAnim = false; mSkipAnim = false;