Revert erroneous changes

7 years ago · b274931165
parent dd2a11b243
commit b274931165
1 changed files with 4 additions and 7 deletions
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@ -430,13 +430,10 @@ 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()
    {
@ -450,7 +447,7 @@ namespace MWDialogue

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