Merge remote-tracking branch 'capostrophic/goodbye'

CHANGELOG.md

@@ -1,13 +1,13 @@
 0.45.0
 ------
     Bug #2835: Player able to slowly move when overencumbered
+    Bug #3897: Have Goodbye give all choices the effects of Goodbye
     Bug #4221: Characters get stuck in V-shaped terrain
     Bug #4293: Faction members are not aware of faction ownerships in barter
     Bug #4327: Missing animations during spell/weapon stance switching
     Bug #4426: RotateWorld behavior is incorrect
     Bug #4429: [Windows] Error on build INSTALL.vcxproj project (debug) with cmake 3.7.2
     Bug #4433: Guard behaviour is incorrect with Alarm = 0
-    Bug #4443: Goodbye option and dialogue choices are not mutually exclusive 
     Feature #4444: Per-group KF-animation files support
 
 0.44.0

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -431,11 +431,8 @@ namespace MWDialogue
 
     void DialogueManager::addChoice (const std::string& text, int choice)
     {
-        if (!mGoodbye)
+        mIsInChoice = true;
-        {
+        mChoices.push_back(std::make_pair(text, choice));
-            mIsInChoice = true;
-            mChoices.push_back(std::make_pair(text, choice));
-        }
     }
 
     const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
@@ -450,8 +447,8 @@ namespace MWDialogue
 
     void DialogueManager::goodbye()
     {
-        if (!mIsInChoice)
+        mIsInChoice = false;
-            mGoodbye = true;
+        mGoodbye = true;
     }
 
     void DialogueManager::persuade(int type, ResponseCallback* callback)

apps/openmw/mwgui/dialogue.cpp

@@ -635,6 +635,11 @@ namespace MWGui
 
     void DialogueWindow::onChoiceActivated(int id)
     {
+        if (mGoodbye)
+        {
+            onGoodbyeActivated();
+            return;
+        }
         MWBase::Environment::get().getDialogueManager()->questionAnswered(id, mCallback.get());
         updateTopics();
     }