aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2012-09-11 00:50:52 +0300
committerFilippos Karapetis2012-09-11 00:50:52 +0300
commit748e3894a3eca344e08c76b64229bcbedff2a784 (patch)
tree55838c2b101500dc536eb6a82a0f616f3037288f /engines
parent5ea896b069df70e7c1fa8467b89457b200e33dc0 (diff)
downloadscummvm-rg350-748e3894a3eca344e08c76b64229bcbedff2a784.tar.gz
scummvm-rg350-748e3894a3eca344e08c76b64229bcbedff2a784.tar.bz2
scummvm-rg350-748e3894a3eca344e08c76b64229bcbedff2a784.zip
TOLTECS: Don't show movie subtitles when subtitles are disabled
Diffstat (limited to 'engines')
-rw-r--r--engines/toltecs/movie.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 79cdd08ec1..33fe249514 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -153,10 +153,10 @@ void MoviePlayer::playMovie(uint resIndex) {
// Already processed
break;
case kChunkShowSubtitle:
- // TODO: Check if the text is a subtitle (last character == 0xFE).
- // If so, don't show it if text display is disabled.
- memcpy(_vm->_script->getSlotData(subtitleSlot), chunkBuffer, chunkSize);
- _vm->_screen->updateTalkText(subtitleSlot, 0);
+ if (_vm->_cfgText) {
+ memcpy(_vm->_script->getSlotData(subtitleSlot), chunkBuffer, chunkSize);
+ _vm->_screen->updateTalkText(subtitleSlot, 0);
+ }
break;
case kChunkShakeScreen: // start/stop shakescreen effect
if (chunkBuffer[0] == 0xFF)