mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 13:15:33 +00:00
Code Issues Releases Wiki Activity

Merged pull request #1777

Browse source
This commit is contained in:
Marc Zinnschlag 2018-06-25 11:58:12 +02:00
commit 705b2dca0e
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -22,7 +22,7 @@
Bug #4036: Weird behaviour of AI packages if package target has non-unique ID Bug #4036: Weird behaviour of AI packages if package target has non-unique ID
Bug #4047: OpenMW not reporting its version number in MacOS; OpenMW-CS not doing it fully Bug #4047: OpenMW not reporting its version number in MacOS; OpenMW-CS not doing it fully
Bug #4125: OpenMW logo cropped on bugtracker Bug #4125: OpenMW logo cropped on bugtracker
Bug #4215: OpenMW shows book text after last <BR> tag Bug #4215: OpenMW shows book text after last EOL tag
Bug #4221: Characters get stuck in V-shaped terrain Bug #4221: Characters get stuck in V-shaped terrain
Bug #4251: Stationary NPCs do not return to their position after combat Bug #4251: Stationary NPCs do not return to their position after combat
Bug #4286: Scripted animations can be interrupted Bug #4286: Scripted animations can be interrupted

11
apps/openmw/mwgui/formatting.cpp
View file

@ -31,13 +31,16 @@ namespace MWGui
boost::algorithm::replace_all(mText, "\r", ""); boost::algorithm::replace_all(mText, "\r", "");
// vanilla game does not show any text after last <BR> tag. // vanilla game does not show any text after the last EOL tag.
const std::string lowerText = Misc::StringUtils::lowerCase(mText); const std::string lowerText = Misc::StringUtils::lowerCase(mText);
int index = lowerText.rfind("<br>"); int brIndex = lowerText.rfind("<br>");
if (index == -1) int pIndex = lowerText.rfind("<p>");
if (brIndex == pIndex)
mText = ""; mText = "";
else if (brIndex > pIndex)
mText = mText.substr(0, brIndex+4);
else else
mText = mText.substr(0, index+4); mText = mText.substr(0, pIndex+3);
registerTag("br", Event_BrTag); registerTag("br", Event_BrTag);
registerTag("p", Event_PTag); registerTag("p", Event_PTag);