libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NANCY: Respect text end marker

Browse Source 
It appears the <e> marker also expects the text
renderer to ignore everything past it. Doing so fixes the
broken string in nancy7 scene 5770.
This commit is contained in:
Kaloyan Chehlarski 2024-02-04 15:23:47 +01:00
parent 1483cb1834
commit c49c10432c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/nancy/misc/hypertext.cpp
View File

@ -85,7 +85,8 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
Common::StringTokenizer tokenizer(_textLines[lineID], "<>\"");
Common::String curToken;
while(!tokenizer.empty()) {
bool reachedEndTag = false;
while(!tokenizer.empty() && !reachedEndTag) {
curToken = tokenizer.nextToken();
if (tokenizer.delimitersAtTokenBegin().lastChar() == '<' && tokenizer.delimitersAtTokenEnd().firstChar() == '>') {
@ -95,14 +96,20 @@ void HypertextParser::drawAllText(const Common::Rect &textBounds, uint leftOffse
// fall through
case 'o' :
// CC end
// fall through
if (curToken.size() != 1) {
break;
}
continue;
case 'e' :
// End conversation. Originally used for quickly ending dialogue when debugging
// We do nothing and just skip
// End conversation. Originally used for quickly ending dialogue when debugging, but
// also marks the ending of the current text line.
if (curToken.size() != 1) {
break;
}
// Ignore the rest of the text. This fixes nancy7 scene 5770
reachedEndTag = true;
continue;
case 'h' :
// Hotspot