krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Make Goodbye and Choice choices mutually exclusive

Browse source
This commit is contained in:
Capostrophic 2018-06-08 14:56:09 +03:00 committed by Capostrophic
parent 53e8882366
commit 11103211c5
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -430,11 +430,13 @@ 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()
{ {
@ -448,7 +450,7 @@ namespace MWDialogue
void DialogueManager::goodbye() void DialogueManager::goodbye()
{ {
mIsInChoice = false; if (!mIsInChoice)
mGoodbye = true; mGoodbye = true;
} }