diff options
| author | Travis Howell | 2006-04-15 05:24:44 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-15 05:24:44 +0000 |
| commit | 18e6b21e288a280df4c8eb78c16013250d660726 (patch) | |
| tree | c6ee3ecc223acc0423706558de10d323fdc7fc21 /engines/simon/simon.cpp | |
| parent | f1592e1fefb7d983ca1ddf8c5b72a71702cdef74 (diff) | |
| download | scummvm-rg350-18e6b21e288a280df4c8eb78c16013250d660726.tar.gz scummvm-rg350-18e6b21e288a280df4c8eb78c16013250d660726.tar.bz2 scummvm-rg350-18e6b21e288a280df4c8eb78c16013250d660726.zip | |
Add support for switching voice file in PC versions of FF and cleanup
svn-id: r21900
Diffstat (limited to 'engines/simon/simon.cpp')
| -rw-r--r-- | engines/simon/simon.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 7e9979ff1a..4e14832a8b 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -3268,10 +3268,12 @@ void SimonEngine::playSpeech(uint speech_id, uint vgaSpriteId) { } _skipVgaWait = true; } else { - if (_subtitles && _language != Common::HB_ISR) { + if (getGameType() == GType_SIMON2 && _subtitles && _language != Common::HB_ISR) { loadVoice(speech_id); return; - } else if (_subtitles && _scriptVar2) { + } + + if (_subtitles && _scriptVar2) { loadSprite(4, 2, 5, 0, 0, 0); waitForSync(205); kill_sprite_simon2(2,5); |