mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 11:53:51 +00:00
Code Issues Releases Wiki Activity

Correct special case soundgen comparisons

Browse source
This commit is contained in:
Capostrophic 2018-08-22 15:26:21 +03:00 committed by Capostrophic
parent ae0a6a22b3
commit f74ebb64af
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwmechanics/character.cpp
View file

@ -913,8 +913,7 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f); sndMgr->playSound3D(mPtr, evt.substr(7), 1.0f, 1.0f);
return; return;
} }
if(evt.compare(0, 10, "soundgen: ") == 0 if(evt.compare(0, 10, "soundgen: ") == 0)
&& evt.compare(10, evt.size()-10, "land") != 0) // Morrowind ignores land soundgen for some reason
{ {
std::string soundgen = evt.substr(10); std::string soundgen = evt.substr(10);
@ -939,11 +938,14 @@ void CharacterController::handleTextKey(const std::string &groupname, const std:
} }
} }
if (soundgen == "land") // Morrowind ignores land soundgen for some reason
return;
std::string sound = mPtr.getClass().getSoundIdFromSndGen(mPtr, soundgen); std::string sound = mPtr.getClass().getSoundIdFromSndGen(mPtr, soundgen);
if(!sound.empty()) if(!sound.empty())
{ {
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
if(evt.compare(10, evt.size()-10, "left") == 0 || evt.compare(10, evt.size()-10, "right") == 0) if(soundgen == "left" || soundgen == "right")
{ {
// Don't make foot sounds local for the player, it makes sense to keep them // Don't make foot sounds local for the player, it makes sense to keep them
// positioned on the ground. // positioned on the ground.