aboutsummaryrefslogtreecommitdiff
path: root/simon/vga.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-10-26 05:31:36 +0000
committerTravis Howell2003-10-26 05:31:36 +0000
commitc7e723ceb4842b5e164e9475a28ecee72b93392a (patch)
treed3925e84cf55121425f455c52715248d63da1036 /simon/vga.cpp
parent1b38419b424cc7e16048dfc3860e0915fa568bd5 (diff)
downloadscummvm-rg350-c7e723ceb4842b5e164e9475a28ecee72b93392a.tar.gz
scummvm-rg350-c7e723ceb4842b5e164e9475a28ecee72b93392a.tar.bz2
scummvm-rg350-c7e723ceb4842b5e164e9475a28ecee72b93392a.zip
Add combined speech and subtitles support for simon2.
svn-id: r10972
Diffstat (limited to 'simon/vga.cpp')
-rw-r--r--simon/vga.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 6fe357c0d2..f6bde58ef4 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1780,7 +1780,7 @@ void SimonEngine::vc_63_palette_thing_2() {
void SimonEngine::vc_64_skip_if_no_speech() {
// Simon2
- if (_sound->_voice_handle == 0)
+ if ((_sound->_voice_handle == 0) || _subtitles)
vc_skip_next_instruction();
}