aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-14 00:37:45 +0100
committerEugene Sandulenko2019-12-14 00:37:45 +0100
commit9a2371ddfbe061cd75fe6a174c52319b7bab362f (patch)
treecf1b1529ab5f8335ccbcd993ef61886b4ebf83d2
parentcd45caa1e0ab9717907d61dca1d3bfb8a83ff4c8 (diff)
downloadscummvm-rg350-9a2371ddfbe061cd75fe6a174c52319b7bab362f.tar.gz
scummvm-rg350-9a2371ddfbe061cd75fe6a174c52319b7bab362f.tar.bz2
scummvm-rg350-9a2371ddfbe061cd75fe6a174c52319b7bab362f.zip
GRAPHICS: MACGUI: Fixed text format parsing
-rw-r--r--engines/director/stxt.cpp3
-rw-r--r--graphics/macgui/mactext.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/director/stxt.cpp b/engines/director/stxt.cpp
index 73e8648bcd..bf9f8e3718 100644
--- a/engines/director/stxt.cpp
+++ b/engines/director/stxt.cpp
@@ -88,8 +88,9 @@ Stxt::Stxt(Common::SeekableSubReadStreamEndian &textStream) {
formattingCount--;
}
- debugC(4, kDebugText, "#### text:\n%s\n####", Common::toPrintable(_ftext).c_str());
_ftext += text;
+
+ debugC(4, kDebugText, "#### text:\n%s\n####", Common::toPrintable(_ftext).c_str());
}
} // End of namespace Director
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index bab29125a6..044931da70 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -129,7 +129,7 @@ static const Common::U32String::value_type *readHex(uint16 *res, const Common::U
for (int i = 0; i < len; i++) {
char b = (char)*s++;
- *res <<= 8;
+ *res <<= 4;
if (tolower(b) > 'a')
*res |= tolower(b) - 'a';
else