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

Merged pull request #1738

Browse source
This commit is contained in:
Marc Zinnschlag 2018-06-08 17:28:08 +02:00
commit 9d0ce25052
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@
Bug #4327: Missing animations during spell/weapon stance switching
Bug #4426: RotateWorld behavior is incorrect
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

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

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