mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 22:15:32 +00:00
Code Issues Releases Wiki Activity

Call updateDialogueGlobals before dialogue starts (Fixes #3034)

Browse source
This commit is contained in:
scrawl 2015-12-19 21:58:49 +01:00
parent 5ac226f519
commit 2176ac592c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,8 @@ namespace MWDialogue
void DialogueManager::startDialogue (const MWWorld::Ptr& actor) void DialogueManager::startDialogue (const MWWorld::Ptr& actor)
{ {
updateGlobals();
// Dialogue with dead actor (e.g. through script) should not be allowed. // Dialogue with dead actor (e.g. through script) should not be allowed.
if (actor.getClass().getCreatureStats(actor).isDead()) if (actor.getClass().getCreatureStats(actor).isDead())
return; return;
@ -331,6 +333,8 @@ namespace MWDialogue
void DialogueManager::updateTopics() void DialogueManager::updateTopics()
{ {
updateGlobals();
std::list<std::string> keywordList; std::list<std::string> keywordList;
int choice = mChoice; int choice = mChoice;
mChoice = -1; mChoice = -1;
@ -417,8 +421,6 @@ namespace MWDialogue
win->setKeywords(keywordList); win->setKeywords(keywordList);
mChoice = choice; mChoice = choice;
updateGlobals();
} }
void DialogueManager::keywordSelected (const std::string& keyword) void DialogueManager::keywordSelected (const std::string& keyword)