mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 01:09:41 +00:00
Code Issues Releases Wiki Activity

Only collect every unique magic bolt sound once (bug #4964)

Browse source
This commit is contained in:
Capostrophic 2019-04-17 19:23:50 +03:00
parent ef985ab422
commit f0433704b4
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -60,6 +60,7 @@
Bug #4947: Player character doesn't use lip animation Bug #4947: Player character doesn't use lip animation
Bug #4948: Footstep sounds while levitating on ground level Bug #4948: Footstep sounds while levitating on ground level
Bug #4963: Enchant skill progress is incorrect Bug #4963: Enchant skill progress is incorrect
Bug #4964: Multiple effect spell projectile sounds play louder than vanilla
Bug #4965: Global light attenuation settings setup is lacking Bug #4965: Global light attenuation settings setup is lacking
Bug #4969: "Miss" sound plays for any actor Bug #4969: "Miss" sound plays for any actor
Bug #4972: Player is able to use quickkeys while disableplayerfighting is active Bug #4972: Player is able to use quickkeys while disableplayerfighting is active

14
apps/openmw/mwworld/projectilemanager.cpp
View file

@ -44,7 +44,7 @@
namespace namespace
{ {
ESM::EffectList getMagicBoltData(std::vector<std::string>& projectileIDs, std::vector<std::string>& sounds, float& speed, std::string& texture, std::string& sourceName, const std::string& id) ESM::EffectList getMagicBoltData(std::vector<std::string>& projectileIDs, std::set<std::string>& sounds, float& speed, std::string& texture, std::string& sourceName, const std::string& id)
{ {
const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
const ESM::EffectList* effects; const ESM::EffectList* effects;
@ -88,9 +88,9 @@ namespace
"alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration" "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
}; };
if (!magicEffect->mBoltSound.empty()) if (!magicEffect->mBoltSound.empty())
sounds.push_back(magicEffect->mBoltSound); sounds.emplace(magicEffect->mBoltSound);
else else
sounds.push_back(schools[magicEffect->mData.mSchool] + " bolt"); sounds.emplace(schools[magicEffect->mData.mSchool] + " bolt");
projectileEffects.mList.push_back(*iter); projectileEffects.mList.push_back(*iter);
} }
@ -297,9 +297,9 @@ namespace MWWorld
createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture); createModel(state, ptr.getClass().getModel(ptr), pos, orient, true, true, lightDiffuseColor, texture);
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
for (size_t it = 0; it != state.mSoundIds.size(); it++) for (const std::string &soundid : state.mSoundIds)
{ {
MWBase::Sound *sound = sndMgr->playSound3D(pos, state.mSoundIds.at(it), 1.0f, 1.0f, MWBase::Sound *sound = sndMgr->playSound3D(pos, soundid, 1.0f, 1.0f,
MWSound::Type::Sfx, MWSound::PlayMode::Loop); MWSound::Type::Sfx, MWSound::PlayMode::Loop);
if (sound) if (sound)
state.mSounds.push_back(sound); state.mSounds.push_back(sound);
@ -656,9 +656,9 @@ namespace MWWorld
createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture); createModel(state, model, osg::Vec3f(esm.mPosition), osg::Quat(esm.mOrientation), true, true, lightDiffuseColor, texture);
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
for (size_t soundIter = 0; soundIter != state.mSoundIds.size(); soundIter++) for (const std::string &soundid : state.mSoundIds)
{ {
MWBase::Sound *sound = sndMgr->playSound3D(esm.mPosition, state.mSoundIds.at(soundIter), 1.0f, 1.0f, MWBase::Sound *sound = sndMgr->playSound3D(esm.mPosition, soundid, 1.0f, 1.0f,
MWSound::Type::Sfx, MWSound::PlayMode::Loop); MWSound::Type::Sfx, MWSound::PlayMode::Loop);
if (sound) if (sound)
state.mSounds.push_back(sound); state.mSounds.push_back(sound);

2
apps/openmw/mwworld/projectilemanager.hpp
View file

@ -102,7 +102,7 @@ namespace MWWorld
float mSpeed; float mSpeed;
std::vector<MWBase::Sound*> mSounds; std::vector<MWBase::Sound*> mSounds;
std::vector<std::string> mSoundIds; std::set<std::string> mSoundIds;
}; };
struct ProjectileState : public State struct ProjectileState : public State