[Scummvm-cvs-logs] scummvm master -> 748e3894a3eca344e08c76b64229bcbedff2a784

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
748e3894a3 TOLTECS: Don't show movie subtitles when subtitles are disabled


Commit: 748e3894a3eca344e08c76b64229bcbedff2a784
    https://github.com/scummvm/scummvm/commit/748e3894a3eca344e08c76b64229bcbedff2a784
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-10T14:50:52-07:00

Commit Message:
TOLTECS: Don't show movie subtitles when subtitles are disabled

Changed paths:
    engines/toltecs/movie.cpp



diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index 79cdd08..33fe249 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)