mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:53:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2556 from Capostrophic/enchant

Browse source 
Make enchantments affect all actors with an inventory (bug #5186)
This commit is contained in:
Andrei Kortunov 2019-10-11 20:53:12 +04:00 committed by GitHub
commit 1a610d3f72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -161,6 +161,7 @@
Bug #5175: Random script function returns an integer value
Bug #5177: Editor: Unexplored map tiles get corrupted after a file with terrain is saved
Bug #5182: OnPCEquip doesn't trigger on skipped beast race attempts to equip something not equippable by beasts
Bug #5186: Equipped item enchantments don't affect creatures
Feature #1774: Handle AvoidNode
Feature #2229: Improve pathfinding AI
Feature #3025: Analogue gamepad movement controls

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

@ -667,7 +667,7 @@ namespace MWMechanics
MagicEffects now = creatureStats.getSpells().getMagicEffects();
if (creature.getClass().isNpc())
if (creature.getClass().hasInventoryStore(creature))
{
MWWorld::InventoryStore& store = creature.getClass().getInventoryStore (creature);
now += store.getMagicEffects();

2
apps/openmw/mwscript/miscextensions.cpp
View file

@ -441,7 +441,7 @@ namespace MWScript
MWMechanics::MagicEffects effects = stats.getSpells().getMagicEffects();
effects += stats.getActiveSpells().getMagicEffects();
if (ptr.getClass().isNpc())
if (ptr.getClass().hasInventoryStore(ptr))
{
MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr);
effects += store.getMagicEffects();