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

Handle greetings differently from responses

Browse source
This commit is contained in:
Andrei Kortunov 2017-06-08 22:40:31 +04:00
parent c2962ced90
commit 4bb9622c21
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); parseText (info->mResponse);
MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor); 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); executeScript (info->mResultScript, mActor);
mLastTopic = Misc::StringUtils::lowerCase(it->mId); mLastTopic = Misc::StringUtils::lowerCase(it->mId);

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

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

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

@ -82,10 +82,11 @@ namespace MWGui
struct Response : DialogueText 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; 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; void addTopicLink (BookTypesetter::Ptr typesetter, intptr_t topicId, size_t begin, size_t end) const;
std::string mTitle; std::string mTitle;
bool mNeedMargin;
}; };
struct Message : DialogueText struct Message : DialogueText
@ -109,7 +110,7 @@ namespace MWGui
void startDialogue(MWWorld::Ptr actor, std::string npcName, bool resetHistory); void startDialogue(MWWorld::Ptr actor, std::string npcName, bool resetHistory);
void setKeywords(std::list<std::string> keyWord); 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); void addMessageBox(const std::string& text);