AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 15:41:13 -04:00
Code Issues Packages Projects 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