mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 14:19:41 +00:00
Code Issues Releases Wiki Activity

Fix dialogue goodbye link conflicting with choice links

Browse source
This commit is contained in:
scrawl 2014-12-01 14:56:13 +01:00
parent 8103d25b09
commit f9ae0d9d66
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwgui/dialogue.cpp
View file

@ -533,9 +533,11 @@ namespace MWGui
if (mGoodbye) if (mGoodbye)
{ {
Goodbye* link = new Goodbye();
mLinks.push_back(link);
std::string goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->getString(); std::string goodbye = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("sGoodbye")->getString();
BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, linkNormal, linkHot, linkActive, BookTypesetter::Style* questionStyle = typesetter->createHotStyle(body, linkNormal, linkHot, linkActive,
TypesetBook::InteractiveId(mLinks.back())); TypesetBook::InteractiveId(link));
typesetter->lineBreak(); typesetter->lineBreak();
typesetter->write(questionStyle, to_utf8_span(goodbye.c_str())); typesetter->write(questionStyle, to_utf8_span(goodbye.c_str()));
} }
@ -654,7 +656,6 @@ namespace MWGui
void DialogueWindow::goodbye() void DialogueWindow::goodbye()
{ {
mLinks.push_back(new Goodbye());
mGoodbye = true; mGoodbye = true;
mEnabled = false; mEnabled = false;
updateHistory(); updateHistory();