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

Don't complain about greetings with no sound

Browse source
This commit is contained in:
scrawl 2014-01-22 00:02:43 +01:00
parent 16f5f5862d
commit f89c400305
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -586,7 +586,8 @@ namespace MWDialogue
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager(); MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
if(winMgr->getSubtitlesEnabled()) if(winMgr->getSubtitlesEnabled())
winMgr->messageBox(info->mResponse); winMgr->messageBox(info->mResponse);
sndMgr->say(actor, info->mSound); if (!info->mSound.empty())
sndMgr->say(actor, info->mSound);
} }
} }

2
components/esm/loadinfo.hpp
View file

@ -70,7 +70,7 @@ struct DialInfo
// Sound and text associated with this item // Sound and text associated with this item
std::string mSound, mResponse; std::string mSound, mResponse;
// Result script (uncomiled) to run whenever this dialog item is // Result script (uncompiled) to run whenever this dialog item is
// selected // selected
std::string mResultScript; std::string mResultScript;