mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 20:49:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1312 from akortunov/guifixes

Browse source 
Split greeting from topic response
This commit is contained in:
scrawl 2017-06-12 23:19:45 +02:00 committed by GitHub
commit 6d90f5a9a5
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,7 @@ namespace MWDialogue
parseText (info->mResponse);
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
win->addResponse (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
win->addResponse (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext), "", false);
executeScript (info->mResultScript, mActor);
mLastTopic = Misc::StringUtils::lowerCase(it->mId);

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

@ -105,23 +105,22 @@ namespace MWGui
// --------------------------------------------------------------------------------------------------
Response::Response(const std::string &text, const std::string &title)
: mTitle(title)
Response::Response(const std::string &text, const std::string &title, bool needMargin)
: mTitle(title), mNeedMargin(needMargin)
{
mText = text;
}
void Response::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, Link*>& topicLinks) const
{
BookTypesetter::Style* title = typesetter->createStyle("", getDialogueTextColour("header"));
typesetter->sectionBreak(mNeedMargin ? 9 : 0);
if (mTitle != "")
{
typesetter->sectionBreak(9);
BookTypesetter::Style* title = typesetter->createStyle("", getDialogueTextColour("header"));
typesetter->write(title, to_utf8_span(mTitle.c_str()));
}
typesetter->sectionBreak();
}
typedef std::pair<size_t, size_t> Range;
std::map<Range, intptr_t> hyperLinks;
@ -552,7 +551,7 @@ namespace MWGui
mHistory->setPosition(0, static_cast<int>(pos) * -1);
}
void DialogueWindow::addResponse(const std::string &text, const std::string &title)
void DialogueWindow::addResponse(const std::string &text, const std::string &title, bool needMargin)
{
// This is called from the dialogue manager, so text is
// case-smashed - thus we have to retrieve the correct case
@ -571,7 +570,7 @@ namespace MWGui
}
}
mHistoryContents.push_back(new Response(text, realTitle));
mHistoryContents.push_back(new Response(text, realTitle, needMargin));
updateHistory();
}

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

@ -82,10 +82,11 @@ namespace MWGui
struct Response : DialogueText
{
Response(const std::string& text, const std::string& title = "");
Response(const std::string& text, const std::string& title = "", bool needMargin = true);
virtual void write (BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map<std::string, Link*>& topicLinks) const;
void addTopicLink (BookTypesetter::Ptr typesetter, intptr_t topicId, size_t begin, size_t end) const;
std::string mTitle;
bool mNeedMargin;
};
struct Message : DialogueText
@ -109,7 +110,7 @@ namespace MWGui
void startDialogue(MWWorld::Ptr actor, std::string npcName, bool resetHistory);
void setKeywords(std::list<std::string> keyWord);
void addResponse (const std::string& text, const std::string& title="");
void addResponse (const std::string& text, const std::string& title="", bool needMargin = true);
void addMessageBox(const std::string& text);