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

Don't apply Charm to creatures (bug #7630)

Browse Source
This commit is contained in:
Alexei Kotov 2023-10-21 07:10:16 +03:00
parent febfa353e0
commit d0ffe6e2f9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -77,6 +77,7 @@
Bug #7603: Scripts menu size is not updated properly Bug #7603: Scripts menu size is not updated properly
Bug #7604: Goblins Grunt becomes idle once injured Bug #7604: Goblins Grunt becomes idle once injured
Bug #7609: ForceGreeting should not open dialogue for werewolves Bug #7609: ForceGreeting should not open dialogue for werewolves
Bug #7630: Charm can be cast on creatures
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples
Feature #5492: Let rain and snow collide with statics Feature #5492: Let rain and snow collide with statics
Feature #6149: Dehardcode Lua API_REVISION Feature #6149: Dehardcode Lua API_REVISION

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

@ -559,6 +559,10 @@ namespace MWMechanics
modifyAiSetting( modifyAiSetting(
target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid); target, effect, ESM::MagicEffect::RallyCreature, AiSetting::Flee, -effect.mMagnitude, invalid);
break; break;
case ESM::MagicEffect::Charm:
if (!target.getClass().isNpc())
invalid = true;
break;
case ESM::MagicEffect::Sound: case ESM::MagicEffect::Sound:
if (target == getPlayer()) if (target == getPlayer())
{ {