Merge branch 'constanteffect' into 'master'

For constant enchantments, allow on-self range for any effect (bug #7643) Closes #7643 See merge request OpenMW/openmw!3657
OpenMW · Dec 15, 2023 · ec480db · ec480db
2 parents 46dc290 + 27bd70a
commit ec480db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -97,6 +97,7 @@
     Bug #7639: NPCs don't use hand-to-hand if their other melee skills were damaged during combat
     Bug #7641: loopgroup loops the animation one time too many for actors
     Bug #7642: Items in repair and recharge menus aren't sorted alphabetically
+    Bug #7643: Can't enchant items with constant effect on self magic effects for non-player character
     Bug #7647: NPC walk cycle bugs after greeting player
     Bug #7654: Tooltips for enchantments with invalid effects cause crashes
     Bug #7660: Some inconsistencies regarding Invisibility breaking

diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -119,7 +119,7 @@ namespace MWGui
 
     void EditEffectDialog::newEffect(const ESM::MagicEffect* effect)
     {
-        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0 || mConstantEffect;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
 
         setMagicEffect(effect);
@@ -240,7 +240,7 @@ namespace MWGui
         // cycle through range types until we find something that's allowed
         // does not handle the case where nothing is allowed (this should be prevented before opening the Add Effect
         // dialog)
-        bool allowSelf = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowSelf = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0 || mConstantEffect;
         bool allowTouch = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
         bool allowTarget = (mMagicEffect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
         if (mEffect.mRange == ESM::RT_Self && !allowSelf)
@@ -629,7 +629,7 @@ namespace MWGui
         const ESM::MagicEffect* effect
             = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(mSelectedKnownEffectId);
 
-        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0;
+        bool allowSelf = (effect->mData.mFlags & ESM::MagicEffect::CastSelf) != 0 || mConstantEffect;
         bool allowTouch = (effect->mData.mFlags & ESM::MagicEffect::CastTouch) && !mConstantEffect;
         bool allowTarget = (effect->mData.mFlags & ESM::MagicEffect::CastTarget) && !mConstantEffect;
 
@@ -751,25 +751,9 @@ namespace MWGui
     void EffectEditorBase::setConstantEffect(bool constant)
     {
         mAddEffectDialog.setConstantEffect(constant);
+        if (!mConstantEffect && constant)
+            for (ESM::ENAMstruct& effect : mEffects)
+                effect.mRange = ESM::RT_Self;
         mConstantEffect = constant;
-
-        if (!constant)
-            return;
-
-        for (auto it = mEffects.begin(); it != mEffects.end();)
-        {
-            if (it->mRange != ESM::RT_Self)
-            {
-                auto& store = *MWBase::Environment::get().getESMStore();
-                auto magicEffect = store.get<ESM::MagicEffect>().find(it->mEffectID);
-                if ((magicEffect->mData.mFlags & ESM::MagicEffect::CastSelf) == 0)
-                {
-                    it = mEffects.erase(it);
-                    continue;
-                }
-                it->mRange = ESM::RT_Self;
-            }
-            ++it;
-        }
     }
 }