Merge branch 'awholelottanothing' into 'master'

Don't crash on spells or enchantments without effects

Closes #7712

See merge request OpenMW/openmw!3643

CHANGELOG.md

@@ -103,6 +103,7 @@
     Bug #7665: Alchemy menu is missing the ability to deselect and choose different qualities of an apparatus
     Bug #7675: Successful lock spell doesn't produce a sound
     Bug #7679: Scene luminance value flashes when toggling shaders
+    Bug #7712: Casting doesn't support spells and enchantments with no effects
     Feature #3537: Shader-based water ripples
     Feature #5492: Let rain and snow collide with statics
     Feature #6149: Dehardcode Lua API_REVISION

apps/openmw/mwgui/hud.cpp

@@ -423,18 +423,22 @@ namespace MWGui
         mSpellBox->setUserString("Spell", spellId.serialize());
         mSpellBox->setUserData(MyGUI::Any::Null);
 
+        if (!spell->mEffects.mList.empty())
+        {
             // use the icon of the first effect
             const ESM::MagicEffect* effect = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
                 spell->mEffects.mList.front().mEffectID);
-
             std::string icon = effect->mIcon;
             std::replace(icon.begin(), icon.end(), '/', '\\');
-        int slashPos = icon.rfind('\\');
+            size_t slashPos = icon.rfind('\\');
             icon.insert(slashPos + 1, "b_");
-        icon = Misc::ResourceHelpers::correctIconPath(icon, MWBase::Environment::get().getResourceSystem()->getVFS());
-
+            icon = Misc::ResourceHelpers::correctIconPath(
+                icon, MWBase::Environment::get().getResourceSystem()->getVFS());
             mSpellImage->setSpellIcon(icon);
         }
+        else
+            mSpellImage->setSpellIcon({});
+    }
 
     void HUD::setSelectedEnchantItem(const MWWorld::Ptr& item, int chargePercent)
     {

apps/openmw/mwgui/itemwidget.cpp

@@ -202,7 +202,7 @@ namespace MWGui
         setIcon(ptr);
     }
 
-    void SpellWidget::setSpellIcon(const std::string& icon)
+    void SpellWidget::setSpellIcon(std::string_view icon)
     {
         if (mFrame && !mCurrentFrame.empty())
         {

apps/openmw/mwgui/itemwidget.hpp

@@ -58,7 +58,7 @@ namespace MWGui
     {
         MYGUI_RTTI_DERIVED(SpellWidget)
     public:
-        void setSpellIcon(const std::string& icon);
+        void setSpellIcon(std::string_view icon);
     };
 
 }

apps/openmw/mwgui/tooltips.cpp

@@ -237,14 +237,16 @@ namespace MWGui
                         params.mNoTarget = false;
                         effects.push_back(params);
                     }
-                    if (MWMechanics::spellIncreasesSkill(
-                            spell)) // display school of spells that contribute to skill progress
+                    // display school of spells that contribute to skill progress
+                    if (MWMechanics::spellIncreasesSkill(spell))
                     {
-                        MWWorld::Ptr player = MWMechanics::getPlayer();
-                        const auto& school
-                            = store->get<ESM::Skill>().find(MWMechanics::getSpellSchool(spell, player))->mSchool;
+                        ESM::RefId id = MWMechanics::getSpellSchool(spell, MWMechanics::getPlayer());
+                        if (!id.empty())
+                        {
+                            const auto& school = store->get<ESM::Skill>().find(id)->mSchool;
                             info.text = "#{sSchool}: " + MyGUI::TextIterator::toTagsString(school->mName).asUTF8();
                         }
+                    }
                     auto cost = focus->getUserString("SpellCost");
                     if (!cost.empty() && cost != "0")
                         info.text

apps/openmw/mwmechanics/character.cpp

@@ -1605,6 +1605,8 @@ namespace MWMechanics
                             effects = &spell->mEffects.mList;
                             cast.playSpellCastingEffects(spell);
                         }
+                        if (!effects->empty())
+                        {
                             if (mCanCast)
                             {
                                 const ESM::MagicEffect* effect = store.get<ESM::MagicEffect>().find(
@@ -1613,10 +1615,9 @@ namespace MWMechanics
                                 const ESM::Static* castStatic
                                     = world->getStore().get<ESM::Static>().find(ESM::RefId::stringRefId("VFX_Hands"));
 
-                            const VFS::Manager* const vfs = MWBase::Environment::get().getResourceSystem()->getVFS();
+                                const VFS::Manager* const vfs
+                                    = MWBase::Environment::get().getResourceSystem()->getVFS();
 
-                            if (!effects->empty())
-                            {
                                 if (mAnimation->getNode("Bip01 L Hand"))
                                     mAnimation->addEffect(
                                         Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), -1, false,
@@ -1627,9 +1628,8 @@ namespace MWMechanics
                                         Misc::ResourceHelpers::correctMeshPath(castStatic->mModel, vfs), -1, false,
                                         "Bip01 R Hand", effect->mParticle);
                             }
-                        }
-
-                        const ESM::ENAMstruct& firstEffect = effects->at(0); // first effect used for casting animation
+                            // first effect used for casting animation
+                            const ESM::ENAMstruct& firstEffect = effects->front();
 
                             std::string startKey;
                             std::string stopKey;
@@ -1662,10 +1662,11 @@ namespace MWMechanics
                                 stopKey = mAttackType + " stop";
                             }
 
-                        mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false, 1,
-                            startKey, stopKey, 0.0f, 0);
+                            mAnimation->play(mCurrentWeapon, priorityWeapon, MWRender::Animation::BlendMask_All, false,
+                                1, startKey, stopKey, 0.0f, 0);
                             mUpperBodyState = UpperBodyState::Casting;
                         }
+                    }
                     else
                     {
                         resetIdle = false;

apps/openmw/mwworld/class.cpp

@@ -524,11 +524,9 @@ namespace MWWorld
 
         const ESM::Enchantment* enchantment
             = MWBase::Environment::get().getESMStore()->get<ESM::Enchantment>().search(enchantmentName);
-        if (!enchantment)
+        if (!enchantment || enchantment->mEffects.mList.empty())
             return result;
 
-        assert(enchantment->mEffects.mList.size());
-
         const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().search(
             enchantment->mEffects.mList.front().mEffectID);
         if (!magicEffect)