Merge pull request #1585

0.6.1-openmw-updates^2
scrawl 7 years ago
commit 70661a4b1c
No known key found for this signature in database
GPG Key ID: 2E6CC3676024C402

@ -968,9 +968,9 @@ namespace MWMechanics
float y = roll / std::min(x, 100.f); float y = roll / std::min(x, 100.f);
y *= 0.25f * x; y *= 0.25f * x;
if (magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration) if (magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)
effect.mDuration = static_cast<int>(y);
else
effect.mDuration = 1; effect.mDuration = 1;
else
effect.mDuration = static_cast<int>(y);
if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude)) if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoMagnitude))
{ {
if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration)) if (!(magicEffect->mData.mFlags & ESM::MagicEffect::NoDuration))

Loading…
Cancel
Save