mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-18 04:20:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'filkry/bug1047dialoglinks'

Browse Source
This commit is contained in:
Marc Zinnschlag 2014-05-11 11:07:23 +02:00
commit a85c73cf35
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwgui/dialogue.cpp
View File

@ -162,7 +162,8 @@ namespace MWGui
{ {
std::string::const_iterator i = text.begin (); std::string::const_iterator i = text.begin ();
KeywordSearchT::Match match; KeywordSearchT::Match match;
while (i != text.end () && keywordSearch->search (i, text.end (), match))
while (i != text.end () && keywordSearch->search (i, text.end (), match, text.begin ()))
{ {
if (i != match.mBeg) if (i != match.mBeg)
addTopicLink (typesetter, 0, i - text.begin (), match.mBeg - text.begin ()); addTopicLink (typesetter, 0, i - text.begin (), match.mBeg - text.begin ());

2
apps/openmw/mwgui/journalviewmodel.cpp
View File

@ -178,7 +178,7 @@ struct JournalViewModelImpl : JournalViewModel
KeywordSearchT::Match match; KeywordSearchT::Match match;
while (i != utf8text.end () && mModel->mKeywordSearch.search (i, utf8text.end (), match)) while (i != utf8text.end () && mModel->mKeywordSearch.search (i, utf8text.end (), match, utf8text.begin()))
{ {
if (i != match.mBeg) if (i != match.mBeg)
visitor (0, i - utf8text.begin (), match.mBeg - utf8text.begin ()); visitor (0, i - utf8text.begin (), match.mBeg - utf8text.begin ());

11
apps/openmw/mwgui/keywordsearch.hpp
View File

@ -66,10 +66,19 @@ public:
return false; return false;
} }
bool search (Point beg, Point end, Match & match) bool search (Point beg, Point end, Match & match, Point start)
{ {
for (Point i = beg; i != end; ++i) for (Point i = beg; i != end; ++i)
{ {
// check if previous character marked start of new word
if (i != start)
{
Point prev = i;
--prev;
if(isalpha(*prev))
continue;
}
// check first character // check first character
typename Entry::childen_t::iterator candidate = mRoot.mChildren.find (std::tolower (*i, mLocale)); typename Entry::childen_t::iterator candidate = mRoot.mChildren.find (std::tolower (*i, mLocale));