From 649ca6b8e63dd50ae441b76187ed28aefd895b2f Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 22 Aug 2022 17:18:15 +0000
Subject: [PATCH] Merge branch 'scroll_indices' into 'master'

Properly transform item ID to enchantment ID

Closes #6959

See merge request OpenMW/openmw!2328

(cherry picked from commit f1e95ad615328274ce76b674cd4a65383f7d8014)

2b9d475e Fix #6959
---
 apps/openmw/mwworld/projectilemanager.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/projectilemanager.cpp b/apps/openmw/mwworld/projectilemanager.cpp
index e610dda19f..60e1a99737 100644
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@@ -569,7 +569,11 @@ namespace MWWorld
             if (const ESM::Spell* spell = esmStore.get<ESM::Spell>().search(magicBoltState.mSpellId))
                 effects = &spell->mEffects;
             else
-                effects = &esmStore.get<ESM::Enchantment>().find(magicBoltState.mSpellId)->mEffects;
+            {
+                MWWorld::ManualRef ref(esmStore, magicBoltState.mSpellId);
+                const MWWorld::Ptr& ptr = ref.getPtr();
+                effects = &esmStore.get<ESM::Enchantment>().find(ptr.getClass().getEnchantment(ptr))->mEffects;
+            }
             cast.inflict(target, caster, *effects, ESM::RT_Target);
 
             magicBoltState.mToDelete = true;