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

Don't apply projectile effects multiple times

Browse source
This commit is contained in:
Allofich 2016-09-01 02:27:02 +09:00
parent f36e5ef403
commit 3300ef5db7
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -307,6 +307,9 @@ namespace MWMechanics
std::string sound; std::string sound;
osg::Vec3f fallbackDirection (0,1,0); osg::Vec3f fallbackDirection (0,1,0);
bool isFirstProjectile = true;
for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin()); for (std::vector<ESM::ENAMstruct>::const_iterator iter (effects.mList.begin());
iter!=effects.mList.end(); ++iter) iter!=effects.mList.end(); ++iter)
{ {
@ -335,8 +338,18 @@ namespace MWMechanics
osg::Vec3f(mTarget.getRefData().getPosition().asVec3())- osg::Vec3f(mTarget.getRefData().getPosition().asVec3())-
osg::Vec3f(mCaster.getRefData().getPosition().asVec3()); osg::Vec3f(mCaster.getRefData().getPosition().asVec3());
// Only send the effects data with the first projectile, so we don't have the impact sounds
// playing multiple times.
if (isFirstProjectile)
MWBase::Environment::get().getWorld()->launchMagicBolt(model, sound, mId, speed, MWBase::Environment::get().getWorld()->launchMagicBolt(model, sound, mId, speed,
false, effects, mCaster, mSourceName, fallbackDirection); false, effects, mCaster, mSourceName, fallbackDirection);
else
{
const ESM::EffectList empty;
MWBase::Environment::get().getWorld()->launchMagicBolt(model, sound, mId, speed,
false, empty, mCaster, mSourceName, fallbackDirection);
}
isFirstProjectile = false;
} }
} }