aboutsummaryrefslogtreecommitdiff
path: root/engines/saga
diff options
context:
space:
mode:
authorFilippos Karapetis2012-05-20 20:14:28 +0300
committerFilippos Karapetis2012-05-20 20:16:16 +0300
commit8c1ca6548d9dd656f093f7b7962612715c0bf5e9 (patch)
treee58207beb5a18d66d7fd7bb56e775219d6a1a366 /engines/saga
parentf8c24b5d8847f512c559ff5b5d7e385eebecd79e (diff)
downloadscummvm-rg350-8c1ca6548d9dd656f093f7b7962612715c0bf5e9.tar.gz
scummvm-rg350-8c1ca6548d9dd656f093f7b7962612715c0bf5e9.tar.bz2
scummvm-rg350-8c1ca6548d9dd656f093f7b7962612715c0bf5e9.zip
SAGA: Fix bug #3528338 - "ITE: Subtitles always shown in introduction"
Diffstat (limited to 'engines/saga')
-rw-r--r--engines/saga/introproc_ite.cpp32
1 files changed, 18 insertions, 14 deletions
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 9248f2b530..484ebe1779 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -126,21 +126,25 @@ EventColumns *Scene::ITEQueueDialogue(EventColumns *eventColumns, int n_dialogue
textEntry.text = dialogue[i].i_str;
entry = _vm->_scene->_textList.addEntry(textEntry);
- // Display text
- event.type = kEvTOneshot;
- event.code = kTextEvent;
- event.op = kEventDisplay;
- event.data = entry;
- event.time = (i == 0) ? 0 : VOICE_PAD;
- eventColumns = _vm->_events->chain(eventColumns, event);
+ if (_vm->_subtitlesEnabled) {
+ // Display text
+ event.type = kEvTOneshot;
+ event.code = kTextEvent;
+ event.op = kEventDisplay;
+ event.data = entry;
+ event.time = (i == 0) ? 0 : VOICE_PAD;
+ eventColumns = _vm->_events->chain(eventColumns, event);
+ }
- // Play voice
- event.type = kEvTOneshot;
- event.code = kVoiceEvent;
- event.op = kEventPlay;
- event.param = dialogue[i].i_voice_rn;
- event.time = 0;
- _vm->_events->chain(eventColumns, event);
+ if (_vm->_voicesEnabled) {
+ // Play voice
+ event.type = kEvTOneshot;
+ event.code = kVoiceEvent;
+ event.op = kEventPlay;
+ event.param = dialogue[i].i_voice_rn;
+ event.time = 0;
+ _vm->_events->chain(eventColumns, event);
+ }
voice_len = _vm->_sndRes->getVoiceLength(dialogue[i].i_voice_rn);
if (voice_len < 0) {