mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-23 01:56:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix7970-remove-removed-spells-on-rest' into 'master'

Browse source 
Magic effects are updated once before applying when resting

Closes #7970

See merge request OpenMW/openmw!4096
This commit is contained in:
Alexei Kotov 2024-05-16 21:47:43 +00:00
commit 7ceaa6424b
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -172,6 +172,7 @@
Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport Bug #7901: Editor: Teleport-related fields shouldn't be editable if a ref does not teleport
Bug #7908: Key bindings names in the settings menu are layout-specific Bug #7908: Key bindings names in the settings menu are layout-specific
Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones Bug #7943: Using "addSoulGem" and "dropSoulGem" commands to creatures works only with "Weapon & Shield" flagged ones
Bug #7970: Difference of GetPCSleep (?) behavior between vanilla and OpenMW
Bug #7980: Paralyzed NPCs' lips move Bug #7980: Paralyzed NPCs' lips move
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples

3
apps/openmw/mwmechanics/actors.cpp
View file

@ -1879,6 +1879,9 @@ namespace MWMechanics
> actorsProcessingRange * actorsProcessingRange) > actorsProcessingRange * actorsProcessingRange)
continue; continue;
// Get rid of effects pending removal so they are not applied when resting
updateMagicEffects(actor.getPtr());
adjustMagicEffects(actor.getPtr(), duration); adjustMagicEffects(actor.getPtr(), duration);
MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(actor.getPtr()); MWRender::Animation* animation = MWBase::Environment::get().getWorld()->getAnimation(actor.getPtr());