diff options
| author | Max Horn | 2003-06-09 00:40:53 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-09 00:40:53 +0000 |
| commit | 18a4fc7df69e63d1015841a013b22b6980bd1a87 (patch) | |
| tree | 1bc7e99f27df3d910b91b9e1424d3c29aea00d6b /scumm/string.cpp | |
| parent | cc41d96b772343fb126b08e881b9cf143f5db14b (diff) | |
| download | scummvm-rg350-18a4fc7df69e63d1015841a013b22b6980bd1a87.tar.gz scummvm-rg350-18a4fc7df69e63d1015841a013b22b6980bd1a87.tar.bz2 scummvm-rg350-18a4fc7df69e63d1015841a013b22b6980bd1a87.zip | |
Fix for bug #746850 (this change was originally meant to 'fix' turning of subtitles in V7/8 games; however this is a totally wrong way to achieve that)
svn-id: r8405
Diffstat (limited to 'scumm/string.cpp')
| -rw-r--r-- | scumm/string.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/string.cpp b/scumm/string.cpp index 282daeb063..dc9ad79c2e 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -261,7 +261,10 @@ void Scumm::CHARSET_1() { has_talk_sound = true; buffer += 14; - // Set flag that speech variant exist of this msg + // Set flag that speech variant exist of this msg. + // TODO: This does not work for the speech system in V7+ games + // since they encode the voice information differently, and it + // is being stripped from the string before it ever gets here. if (_haveMsg == 0xFF) _haveMsg = 0xFE; break; @@ -298,9 +301,6 @@ void Scumm::CHARSET_1() { c += *buffer++ * 256; if (_version <= 3) { _charset->printChar(c); - } else if (_version >= 6) { - if (!_noSubtitles || (_haveMsg != 0xFE && _haveMsg != 0xFF)) - _charset->printChar(c); } else { if (!_noSubtitles || _haveMsg != 0xFE) _charset->printChar(c); |