mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-17 22:13:08 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rollingredienteffect' into 'master'

Browse source 
Fix non-player ingredient casting

See merge request OpenMW/openmw!4480
This commit is contained in:
jvoisin 2024-12-16 16:36:35 +00:00
commit 95764a9e0a
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -454,11 +454,15 @@ namespace MWMechanics
ESM::ActiveSpells::Flag_Temporary | ESM::ActiveSpells::Flag_Stackable); ESM::ActiveSpells::Flag_Temporary | ESM::ActiveSpells::Flag_Stackable);
mSourceName = ingredient->mName; mSourceName = ingredient->mName;
auto effect = rollIngredientEffect(mCaster, ingredient, mCaster != getPlayer()); std::optional<ESM::EffectList> effect = rollIngredientEffect(mCaster, ingredient, 0);
if (effect) if (effect)
{
inflict(mCaster, *effect, ESM::RT_Self); inflict(mCaster, *effect, ESM::RT_Self);
else return true;
}
if (mCaster == getPlayer())
{ {
// "X has no effect on you" // "X has no effect on you"
std::string message = MWBase::Environment::get() std::string message = MWBase::Environment::get()
@ -468,10 +472,9 @@ namespace MWMechanics
->mValue.getString(); ->mValue.getString();
message = Misc::StringUtils::format(message, ingredient->mName); message = Misc::StringUtils::format(message, ingredient->mName);
MWBase::Environment::get().getWindowManager()->messageBox(message); MWBase::Environment::get().getWindowManager()->messageBox(message);
return false;
} }
return true; return false;
} }
void CastSpell::playSpellCastingEffects(const ESM::Enchantment* enchantment) const void CastSpell::playSpellCastingEffects(const ESM::Enchantment* enchantment) const