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

Merge branch 'swimhack' into 'master'

Browse Source 
Remove 0.43.0 death animation backward compatibility hack (#5977)

Closes #5977

See merge request OpenMW/openmw!2274
This commit is contained in:
psi29a 2022-08-16 07:40:13 +00:00
commit 1f25f430d6
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
Bug #4127: Weapon animation looks choppy
Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses
Bug #5129: Stuttering animation on Centurion Archer
Bug #5977: Fatigueless NPCs' corpse underwater changes animation on game load
0.48.0
------

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

@ -764,16 +764,6 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
{
mDeathState = death;
mCurrentDeath = deathStateToAnimGroup(mDeathState);
// Make sure the character was swimming upon death for forward-compatibility
if (!MWBase::Environment::get().getWorld()->isSwimming(mPtr))
{
if (mDeathState == CharState_SwimDeathKnockDown)
mCurrentDeath = "deathknockdown";
else if (mDeathState == CharState_SwimDeathKnockOut)
mCurrentDeath = "deathknockout";
}
mPtr.getClass().getCreatureStats(mPtr).setDeathAnimation(mDeathState - CharState_Death1);
// For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.