mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Closes #1065: Don't apply fall damage when landing in water

Browse Source
This commit is contained in:
scrawl 2013-12-29 00:36:36 +01:00
parent 2a8ab932ef
commit 17ff8165d2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwmechanics/character.cpp
View File

@ -802,6 +802,9 @@ void CharacterController::update(float duration)
if(sneak || inwater || flying) if(sneak || inwater || flying)
vec.z = 0.0f; vec.z = 0.0f;
if (inwater || flying)
cls.getCreatureStats(mPtr).land();
if(!onground && !flying && !inwater) if(!onground && !flying && !inwater)
{ {
// In the air (either getting up —ascending part of jump— or falling). // In the air (either getting up —ascending part of jump— or falling).
@ -925,7 +928,7 @@ void CharacterController::update(float duration)
} }
} }
if (onground || inwater || flying) if (onground)
cls.getCreatureStats(mPtr).land(); cls.getCreatureStats(mPtr).land();
if(movestate != CharState_None) if(movestate != CharState_None)