diff options
author | David Eriksson | 2004-01-10 15:53:51 +0000 |
---|---|---|
committer | David Eriksson | 2004-01-10 15:53:51 +0000 |
commit | 2f82a5c573f27ad3ea41346fe4d1b712204c89a4 (patch) | |
tree | d697c2c8dd21412b5b434cee9389873f6ccd6fe8 /queen/talk.cpp | |
parent | 102cf0254aac784ff0941f4f3f99951705ec6fa0 (diff) | |
download | scummvm-rg350-2f82a5c573f27ad3ea41346fe4d1b712204c89a4.tar.gz scummvm-rg350-2f82a5c573f27ad3ea41346fe4d1b712204c89a4.tar.bz2 scummvm-rg350-2f82a5c573f27ad3ea41346fe4d1b712204c89a4.zip |
Honor speech and subtitle toggles
svn-id: r12298
Diffstat (limited to 'queen/talk.cpp')
-rw-r--r-- | queen/talk.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index 3ce3a354bc..7206a5fb9b 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -943,7 +943,8 @@ void Talk::speakSegment( // FIXME - it seems the french talkie version has a useless voice file ; // the c30e_102 file is very similar to c30e_101, so there is no need to // play it. This voice was used in room 30 (N8) when talking to Klunk. - if (!(_vm->resource()->getLanguage() == FRENCH && !strcmp(voiceFileName, "c30e_102"))) + if (!(_vm->resource()->getLanguage() == FRENCH && !strcmp(voiceFileName, "c30e_102")) + && _vm->sound()->speechOn()) _vm->sound()->playSfx(voiceFileName); int faceDirectionCommand = 0; @@ -1011,7 +1012,8 @@ void Talk::speakSegment( int startFrame = 0; if (_talkHead && isJoe) { - _vm->graphics()->setBobText(bob, segment, textX, textY, color, true); + if (_vm->subtitles()) + _vm->graphics()->setBobText(bob, segment, textX, textY, color, true); defaultAnimation(segment, isJoe, parameters, startFrame, bankNum); } else { @@ -1066,7 +1068,8 @@ void Talk::speakSegment( headStringAnimation(parameters, bobNum, bankNum); } - _vm->graphics()->setBobText(bob, segment, textX, textY, color, _talkHead); + if (_vm->subtitles()) + _vm->graphics()->setBobText(bob, segment, textX, textY, color, _talkHead); if (parameters->animation[0] != '\0' && parameters->animation[0] != 'E') { stringAnimation(parameters, startFrame, bankNum); |