aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-06-01 23:32:01 +0000
committerMax Horn2002-06-01 23:32:01 +0000
commitd5f527fc622f14c91f5808d53db6d3097e485a35 (patch)
treef768f6851a166585d92f0c255e7908a29c6facab
parent7fd85530a50a580a7e11127ccc72f58070095cae (diff)
downloadscummvm-rg350-d5f527fc622f14c91f5808d53db6d3097e485a35.tar.gz
scummvm-rg350-d5f527fc622f14c91f5808d53db6d3097e485a35.tar.bz2
scummvm-rg350-d5f527fc622f14c91f5808d53db6d3097e485a35.zip
undoing my previous changes, it's completly bogus(sorry)
svn-id: r4393
-rw-r--r--string.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/string.cpp b/string.cpp
index 679bcf68da..192c034aab 100644
--- a/string.cpp
+++ b/string.cpp
@@ -328,14 +328,6 @@ 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) {
@@ -373,11 +365,11 @@ void Scumm::CHARSET_1()
charset.printCharOld(c);
else if (!(_features & GF_AFTER_V6)) {
// if (!_vars[VAR_V5_CHARFLAG]) { /* FIXME */
- if (!(has_speech && _noSubtitles))
+ if (!(a && _noSubtitles))
charset.printChar(c);
// }
} else {
- if (!(has_speech && _noSubtitles))
+ if (!(a && _noSubtitles))
charset.printChar(c);
}