aboutsummaryrefslogtreecommitdiff
path: root/string.cpp
diff options
context:
space:
mode:
authorMax Horn2002-06-01 23:05:51 +0000
committerMax Horn2002-06-01 23:05:51 +0000
commit7fd85530a50a580a7e11127ccc72f58070095cae (patch)
tree9d0df908334717c4b3df613a02017d4c32cab709 /string.cpp
parentc96245f631bfc3e39e5e731f9cf4b686bebf9cf2 (diff)
downloadscummvm-rg350-7fd85530a50a580a7e11127ccc72f58070095cae.tar.gz
scummvm-rg350-7fd85530a50a580a7e11127ccc72f58070095cae.tar.bz2
scummvm-rg350-7fd85530a50a580a7e11127ccc72f58070095cae.zip
fix for #529538
svn-id: r4392
Diffstat (limited to 'string.cpp')
-rw-r--r--string.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/string.cpp b/string.cpp
index 192c034aab..679bcf68da 100644
--- a/string.cpp
+++ b/string.cpp
@@ -328,6 +328,14 @@ void Scumm::CHARSET_1()
charset._disableOffsX = charset._unk12 = !_keepText;
+ bool has_speech = false;
+ for (byte *tmp = buffer; *tmp; ++tmp) {
+ if (*tmp == 10) {
+ has_speech = true;
+ break;
+ }
+ }
+
do {
c = *buffer++;
if (c == 0) {
@@ -365,11 +373,11 @@ void Scumm::CHARSET_1()
charset.printCharOld(c);
else if (!(_features & GF_AFTER_V6)) {
// if (!_vars[VAR_V5_CHARFLAG]) { /* FIXME */
- if (!(a && _noSubtitles))
+ if (!(has_speech && _noSubtitles))
charset.printChar(c);
// }
} else {
- if (!(a && _noSubtitles))
+ if (!(has_speech && _noSubtitles))
charset.printChar(c);
}