mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 15:11:33 +00:00
Code Issues Releases Wiki Activity

Merge branch 'notsocharmingnow' into 'master'

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

Closes #7630

See merge request OpenMW/openmw!3507
This commit is contained in:
psi29a 2023-10-22 08:52:04 +00:00
commit 631a3954b1
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())
{ {