mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-19 17:39:44 +00:00
Code Issues Releases Wiki Activity

Merge pull request #204 from OpenMW/master while resolving conflicts

Browse source 
# Conflicts:
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
This commit is contained in:
David Cernat 2017-04-22 14:33:26 +03:00
commit 4ebc9f1314
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -658,6 +658,8 @@ namespace MWDialogue
winMgr->messageBox(info->mResponse);
if (!info->mSound.empty())
sndMgr->say(actor, info->mSound);
if (!info->mResultScript.empty())
executeScript(info->mResultScript, actor);
/*
Start of tes3mp addition
@ -675,9 +677,6 @@ namespace MWDialogue
End of tes3mp addition
*/
}
if (!info->mResultScript.empty())
executeScript(info->mResultScript, actor);
}
int DialogueManager::countSavedGameRecords() const