mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 06:40:22 +00:00
Code Issues Projects Releases Wiki Activity

Make enchanted item casting use accurate aiming for 1 frame (bug #6909)

Browse Source
This commit is contained in:
Alexei Kotov 2022-07-28 19:03:17 +03:00
parent c54822acf9
commit 16e373f30e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -135,6 +135,7 @@
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
Bug #6901: Morrowind.exe soul gem usage discrepancy Bug #6901: Morrowind.exe soul gem usage discrepancy
Bug #6909: Using enchanted items has no animation
Feature #890: OpenMW-CS: Column filtering Feature #890: OpenMW-CS: Column filtering
Feature #1465: "Reset" argument for AI functions Feature #1465: "Reset" argument for AI functions
Feature #2491: Ability to make OpenMW "portable" Feature #2491: Ability to make OpenMW "portable"

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

@ -1400,6 +1400,7 @@ bool CharacterController::updateState(CharacterState idle)
// Enchanted items by default do not use casting animations // Enchanted items by default do not use casting animations
world->castSpell(mPtr); world->castSpell(mPtr);
resetIdle = false; resetIdle = false;
mUpperBodyState = UpperCharState_CastingSpell;
} }
else if(!spellid.empty() && canCast) else if(!spellid.empty() && canCast)
{ {
@ -1565,7 +1566,8 @@ bool CharacterController::updateState(CharacterState idle)
resetCurrentIdleState(); resetCurrentIdleState();
} }
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete); // Spellcasting animation needs to "play" for at least one frame to reset the aiming factor
animPlaying = mAnimation->getInfo(mCurrentWeapon, &complete) || mUpperBodyState == UpperCharState_CastingSpell;
if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack && !isKnockedDown()) if(mUpperBodyState == UpperCharState_MinAttackToMaxAttack && !isKnockedDown())
mAttackStrength = complete; mAttackStrength = complete;
} }