mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-06 09:39:49 +00:00
Code Issues Projects Releases Wiki Activity

Revert erroneous changes

Browse Source
This commit is contained in:
Capostrophic 2018-06-08 19:18:53 +03:00 committed by GitHub
parent dd2a11b243
commit b274931165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View File

@ -430,13 +430,10 @@ namespace MWDialogue
} }
void DialogueManager::addChoice (const std::string& text, int choice) void DialogueManager::addChoice (const std::string& text, int choice)
{
if (!mGoodbye)
{ {
mIsInChoice = true; mIsInChoice = true;
mChoices.push_back(std::make_pair(text, choice)); mChoices.push_back(std::make_pair(text, choice));
} }
}
const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices() const std::vector<std::pair<std::string, int> >& DialogueManager::getChoices()
{ {
@ -450,7 +447,7 @@ namespace MWDialogue
void DialogueManager::goodbye() void DialogueManager::goodbye()
{ {
if (!mIsInChoice) mIsInChoice = false;
mGoodbye = true; mGoodbye = true;
} }