krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1321 from akortunov/spellpriority

Browse source 
Use mRange to check spell range instead of mArea.
This commit is contained in:
scrawl 2017-06-13 17:06:47 +02:00 committed by GitHub
commit 53264f34b3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmechanics/aicombataction.cpp
View file

@ -889,7 +889,7 @@ namespace MWMechanics
for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt) spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
{ {
if (effectIt->mArea == ESM::RT_Target) if (effectIt->mRange == ESM::RT_Target)
{ {
const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID); const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
dist = effect->mData.mSpeed; dist = effect->mData.mSpeed;
@ -906,7 +906,7 @@ namespace MWMechanics
for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
ench->mEffects.mList.begin(); effectIt != ench->mEffects.mList.end(); ++effectIt) ench->mEffects.mList.begin(); effectIt != ench->mEffects.mList.end(); ++effectIt)
{ {
if (effectIt->mArea == ESM::RT_Target) if (effectIt->mRange == ESM::RT_Target)
{ {
const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID); const ESM::MagicEffect* effect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectIt->mEffectID);
dist = effect->mData.mSpeed; dist = effect->mData.mSpeed;
@ -1029,7 +1029,7 @@ namespace MWMechanics
for (std::vector<ESM::ENAMstruct>::const_iterator effectIt = for (std::vector<ESM::ENAMstruct>::const_iterator effectIt =
spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt) spell->mEffects.mList.begin(); effectIt != spell->mEffects.mList.end(); ++effectIt)
{ {
if (effectIt->mArea == ESM::RT_Target) if (effectIt->mRange == ESM::RT_Target)
{ {
if (!MWBase::Environment::get().getWorld()->isSwimming(enemy)) if (!MWBase::Environment::get().getWorld()->isSwimming(enemy))
mult = fAIRangeMagicSpellMult; mult = fAIRangeMagicSpellMult;