aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorJonathan Gray2003-08-28 10:10:32 +0000
committerJonathan Gray2003-08-28 10:10:32 +0000
commit0a7dd227b8296446d743aa9c5b32fb2d0ab72881 (patch)
treea88271cca0ad5291dd08e16b525bc6205380d31f /scumm
parent906c7818ece3325a093ac6fc3a3325452723ee39 (diff)
downloadscummvm-rg350-0a7dd227b8296446d743aa9c5b32fb2d0ab72881.tar.gz
scummvm-rg350-0a7dd227b8296446d743aa9c5b32fb2d0ab72881.tar.bz2
scummvm-rg350-0a7dd227b8296446d743aa9c5b32fb2d0ab72881.zip
revert previous broken commit which didn't logically make sense as it was checking for negative on an unsigned number, and would have broken several things if it compiled
svn-id: r9889
Diffstat (limited to 'scumm')
-rw-r--r--scumm/string.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 75dd18b0a7..2697455bf3 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -310,7 +310,7 @@ void Scumm::CHARSET_1() {
if (_version <= 3) {
_charset->printChar(c);
} else {
- if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle >= 0)) {
+ if (_noSubtitles && (_haveMsg == 0xFE || _sound->_talkChannelHandle)) {
// Subtitles are turned off, and there is a voice version
// of this message -> don't print it.
} else