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

[Client] Prevent NPC subtitles from being added to open Dialogue window

Browse source
This commit is contained in:
David Cernat 2017-05-05 20:16:20 +03:00
parent bcdbecf608
commit 8b4e167efe
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -654,8 +654,17 @@ namespace MWDialogue
if(info != NULL)
{
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
if(winMgr->getSubtitlesEnabled())
winMgr->messageBox(info->mResponse);
if (winMgr->getSubtitlesEnabled())
/*
Start of tes3mp change (minor)
Prevent subtitles for NPC sounds from being added to a currently open dialogue window,
which wasn't a problem in regular OpenMW because time was frozen during dialogue
*/
winMgr->messageBox(info->mResponse, MWGui::ShowInDialogueMode_Never);
/*
End of tes3mp change (minor)
*/
if (!info->mSound.empty())
sndMgr->say(actor, info->mSound);
if (!info->mResultScript.empty())

2
apps/openmw/mwmp/DedicatedActor.cpp
View file

@ -138,7 +138,7 @@ void DedicatedActor::playSound()
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
if (winMgr->getSubtitlesEnabled())
winMgr->messageBox(response);
winMgr->messageBox(response, MWGui::ShowInDialogueMode_Never);
sound.clear();
}