diff options
| author | Filippos Karapetis | 2014-12-29 12:34:55 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-29 12:34:55 +0200 |
| commit | f4d5b150f1e4b786f2f6f79a1acd3315da9a8699 (patch) | |
| tree | e1cadcc9561ed34e7462239bc5a2c82fd342cb89 /engines/zvision/scripting | |
| parent | 83dd389d255ae63affc3600742d564a8d2cb914c (diff) | |
| download | scummvm-rg350-f4d5b150f1e4b786f2f6f79a1acd3315da9a8699.tar.gz scummvm-rg350-f4d5b150f1e4b786f2f6f79a1acd3315da9a8699.tar.bz2 scummvm-rg350-f4d5b150f1e4b786f2f6f79a1acd3315da9a8699.zip | |
ZVISION: Show system messages when subtitles are disabled
Thanks to Marisa-Chan for spotting this
Diffstat (limited to 'engines/zvision/scripting')
| -rw-r--r-- | engines/zvision/scripting/sidefx/music_node.cpp | 2 | ||||
| -rw-r--r-- | engines/zvision/scripting/sidefx/syncsound_node.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp index 6be08b46dc..0cada6d748 100644 --- a/engines/zvision/scripting/sidefx/music_node.cpp +++ b/engines/zvision/scripting/sidefx/music_node.cpp @@ -137,7 +137,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) { if (_pantrack || _volume != _newvol) setVolume(_newvol); - if (_sub) + if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1) _sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100); } return false; diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp index c1f139694b..eec320bf2e 100644 --- a/engines/zvision/scripting/sidefx/syncsound_node.cpp +++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp @@ -76,7 +76,7 @@ bool SyncSoundNode::process(uint32 deltaTimeInMillis) { if (_engine->getScriptManager()->getSideFX(_syncto) == NULL) return stop(); - if (_sub) + if (_sub && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1) _sub->process(_engine->_mixer->getSoundElapsedTime(_handle) / 100); } return false; |