AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 23:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Unbreak swimdeath fallback

Browse Source
This commit is contained in:
Evil Eye 2025-07-19 09:38:44 +02:00
parent 1dfa2629f0
commit 39cc893639
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -80,7 +80,6 @@
Bug #4754: Stack of ammunition cannot be equipped partially Bug #4754: Stack of ammunition cannot be equipped partially
Bug #4816: GetWeaponDrawn returns 1 before weapon is attached Bug #4816: GetWeaponDrawn returns 1 before weapon is attached
Bug #4822: Non-weapon equipment and body parts can't inherit time from parent animation Bug #4822: Non-weapon equipment and body parts can't inherit time from parent animation
Bug #4885: Disable in dialogue result script causes a crash
Bug #4898: Odd/Incorrect lighting on meshes Bug #4898: Odd/Incorrect lighting on meshes
Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses
Bug #5062: Root bone rotations for NPC animation don't work the same as for creature animation Bug #5062: Root bone rotations for NPC animation don't work the same as for creature animation

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

@ -883,13 +883,12 @@ namespace MWMechanics
} }
mDeathState = hitStateToDeathState(mHitState); mDeathState = hitStateToDeathState(mHitState);
if (mDeathState == CharState_None) if (mDeathState == CharState_None && MWBase::Environment::get().getWorld()->isSwimming(mPtr))
{ mDeathState = CharState_SwimDeath;
if (MWBase::Environment::get().getWorld()->isSwimming(mPtr))
mDeathState = CharState_SwimDeath; if (mDeathState == CharState_None
else if (mAnimation && !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState))) || (mAnimation && !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState))))
mDeathState = chooseRandomDeathState(); mDeathState = chooseRandomDeathState();
}
// Do not interrupt scripted animation by death // Do not interrupt scripted animation by death
if (!mAnimation || isScriptedAnimPlaying()) if (!mAnimation || isScriptedAnimPlaying())
@ -1160,7 +1159,7 @@ namespace MWMechanics
else if (action == "shoot release") else if (action == "shoot release")
{ {
// See notes for melee release above // See notes for melee release above
if (mAttackStrength != -1.f && mAnimation) if (mAttackStrength != -1.f && mAnimation)
{ {
mAnimation->releaseArrow(mAttackStrength); mAnimation->releaseArrow(mAttackStrength);
mReadyToHit = false; mReadyToHit = false;