mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-23 19:16:21 +00:00
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
This commit is contained in:
parent
cc41d96b77
commit
18a4fc7df6
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user