mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-15 18:16:33 +00:00
Merge branch 'nomagnitudeforyou' into 'master'
Don't multiply magnitudes for effects that don't have magnitudes Closes #8540 See merge request OpenMW/openmw!4810
This commit is contained in:
commit
176dab5b3d
1 changed files with 5 additions and 2 deletions
|
@ -377,9 +377,12 @@ namespace
|
||||||
MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
|
MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicTargetResisted}");
|
||||||
return MWMechanics::MagicApplicationResult::Type::REMOVED;
|
return MWMechanics::MagicApplicationResult::Type::REMOVED;
|
||||||
}
|
}
|
||||||
|
else if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
|
||||||
|
{
|
||||||
effect.mMinMagnitude *= magnitudeMult;
|
effect.mMinMagnitude *= magnitudeMult;
|
||||||
effect.mMaxMagnitude *= magnitudeMult;
|
effect.mMaxMagnitude *= magnitudeMult;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return MWMechanics::MagicApplicationResult::Type::APPLIED;
|
return MWMechanics::MagicApplicationResult::Type::APPLIED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue