mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merged pull request #1738
This commit is contained in:
commit
9d0ce25052
@ -6,6 +6,7 @@
|
|||||||
Bug #4327: Missing animations during spell/weapon stance switching
|
Bug #4327: Missing animations during spell/weapon stance switching
|
||||||
Bug #4426: RotateWorld behavior is incorrect
|
Bug #4426: RotateWorld behavior is incorrect
|
||||||
Bug #4433: Guard behaviour is incorrect with Alarm = 0
|
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
|
Feature #4444: Per-group KF-animation files support
|
||||||
|
|
||||||
0.44.0
|
0.44.0
|
||||||
|
@ -431,9 +431,11 @@ namespace MWDialogue
|
|||||||
|
|
||||||
void DialogueManager::addChoice (const std::string& text, int choice)
|
void DialogueManager::addChoice (const std::string& text, int choice)
|
||||||
{
|
{
|
||||||
mIsInChoice = true;
|
if (!mGoodbye)
|
||||||
|
{
|
||||||
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()
|
||||||
@ -448,8 +450,8 @@ namespace MWDialogue
|
|||||||
|
|
||||||
void DialogueManager::goodbye()
|
void DialogueManager::goodbye()
|
||||||
{
|
{
|
||||||
mIsInChoice = false;
|
if (!mIsInChoice)
|
||||||
mGoodbye = true;
|
mGoodbye = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogueManager::persuade(int type, ResponseCallback* callback)
|
void DialogueManager::persuade(int type, ResponseCallback* callback)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user