Make Goodbye and Choice choices mutually exclusive

7 years ago · 11103211c5
parent 53e8882366
commit 11103211c5
1 changed files with 7 additions and 5 deletions
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@ -430,11 +430,13 @@ namespace MWDialogue
    }

    void DialogueManager::addChoice (const std::string& text, int choice)
+    {
+        if (!mGoodbye)
        {
            mIsInChoice = true;
-
            mChoices.push_back(std::make_pair(text, choice));
        }
+    }

    const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
    {
@ -448,7 +450,7 @@ namespace MWDialogue

    void DialogueManager::goodbye()
    {
-        mIsInChoice = false;
+        if (!mIsInChoice)
            mGoodbye = true;
    }