Merge branch 'breaklilacor' into 'master'

Allow GetEffect to detect 0 magnitude spells Closes #8097 See merge request OpenMW/openmw!4297
OpenMW · Aug 11, 2024 · 9234b57 · 9234b57
2 parents 4938525 + fe50b1a
commit 9234b57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -188,6 +188,7 @@
     Bug #8063: menu_background.bik video with audio freezes the game forever
     Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
     Bug #8085: Don't search in scripts or shaders directories for "Select directories you wish to add" menu in launcher
+    Bug #8097: GetEffect doesn't detect 0 magnitude spells
     Feature #1415: Infinite fall failsafe
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking

diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
@@ -603,15 +603,15 @@ namespace MWScript
                     key = ESM::MagicEffect::effectGmstIdToIndex(effect);
 
                 const MWMechanics::CreatureStats& stats = ptr.getClass().getCreatureStats(ptr);
-
-                const MWMechanics::MagicEffects& effects = stats.getMagicEffects();
-
-                for (const auto& activeEffect : effects)
+                for (const auto& spell : stats.getActiveSpells())
                 {
-                    if (activeEffect.first.mId == key && activeEffect.second.getModifier() > 0)
+                    for (const auto& effect : spell.getEffects())
                     {
-                        runtime.push(1);
-                        return;
+                        if (effect.mFlags & ESM::ActiveEffect::Flag_Applied && effect.mEffectId == key)
+                        {
+                            runtime.push(1);
+                            return;
+                        }
                     }
                 }
                 runtime.push(0);