mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 14:45:37 +00:00
Code Issues Releases Wiki Activity

Ensure forward-compatibility of death animations in old saves (fixes #4274)

Browse source
This commit is contained in:
Capostrophic 2018-07-05 22:49:40 +03:00 committed by GitHub
parent b36bd75b59
commit 9abfabb065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -662,16 +662,19 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
void CharacterController::playDeath(float startpoint, CharacterState death) void CharacterController::playDeath(float startpoint, CharacterState death)
{ {
// Make sure the character was swimming upon death for forward-compatibility
const bool wasSwimming = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
switch (death) switch (death)
{ {
case CharState_SwimDeath: case CharState_SwimDeath:
mCurrentDeath = "swimdeath"; mCurrentDeath = "swimdeath";
break; break;
case CharState_SwimDeathKnockDown: case CharState_SwimDeathKnockDown:
mCurrentDeath = "swimdeathknockdown"; mCurrentDeath = (wasSwimming ? "swimdeathknockdown" : "deathknockdown");
break; break;
case CharState_SwimDeathKnockOut: case CharState_SwimDeathKnockOut:
mCurrentDeath = "swimdeathknockout"; mCurrentDeath = (wasSwimming ? "swimdeathknockout" : "deathknockout");
break; break;
case CharState_DeathKnockDown: case CharState_DeathKnockDown:
mCurrentDeath = "deathknockdown"; mCurrentDeath = "deathknockdown";