teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 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

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

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