mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 12:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'spellcasting' into 'master'

Browse Source 
Fix spellcasting state getting stuck due to premature attack attempts

Closes #6917

See merge request OpenMW/openmw!2216
This commit is contained in:
psi29a 2022-07-31 08:14:31 +00:00
commit e3f04794e3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1348,7 +1348,7 @@ bool CharacterController::updateWeaponState(CharacterState idle)
return forcestateupdate;
float complete;
bool animPlaying;
bool animPlaying = false;
ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
if(getAttackingOrSpell())
{
@ -1409,6 +1409,8 @@ bool CharacterController::updateWeaponState(CharacterState idle)
// Enchanted items by default do not use casting animations
world->castSpell(mPtr);
resetIdle = false;
// Spellcasting animation needs to "play" for at least one frame to reset the aiming factor
animPlaying = true;
mUpperBodyState = UpperCharState_CastingSpell;
}
// Play the spellcasting animation/VFX if the spellcasting was successful or failed due to insufficient magicka.
@ -1583,8 +1585,8 @@ bool CharacterController::updateWeaponState(CharacterState idle)
resetCurrentIdleState();
}
// Spellcasting animation needs to "play" for at least one frame to reset the aiming factor
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete) || mUpperBodyState == UpperCharState_CastingSpell;
if (!animPlaying)
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete);
if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack && !isKnockedDown())
mAttackStrength = complete;
}