mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-31 21:45:35 +00:00
Merge branch 'hardlanding' into 'master'
Init mJumpState based on saved fallheight (#5739) See merge request OpenMW/openmw!532
This commit is contained in:
commit
29fdcb3fa1
2 changed files with 5 additions and 0 deletions
|
@ -88,6 +88,7 @@
|
|||
Bug #5703: OpenMW-CS menu system crashing on XFCE
|
||||
Bug #5706: AI sequences stop looping after the saved game is reloaded
|
||||
Bug #5731: Editor: skirts are invisible on characters
|
||||
Bug #5739: Saving and loading the save a second or two before hitting the ground doesn't count fall damage
|
||||
Bug #5758: Paralyzed actors behavior is inconsistent with vanilla
|
||||
Bug #5762: Movement solver is insufficiently robust
|
||||
Feature #390: 3rd person look "over the shoulder"
|
||||
|
|
|
@ -883,7 +883,11 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
|
|||
}
|
||||
|
||||
if(!cls.getCreatureStats(mPtr).isDead())
|
||||
{
|
||||
mIdleState = CharState_Idle;
|
||||
if (cls.getCreatureStats(mPtr).getFallHeight() > 0)
|
||||
mJumpState = JumpState_InAir;
|
||||
}
|
||||
else
|
||||
{
|
||||
const MWMechanics::CreatureStats& cStats = mPtr.getClass().getCreatureStats(mPtr);
|
||||
|
|
Loading…
Reference in a new issue