[Scummvm-cvs-logs] scummvm master -> f4d5b150f1e4b786f2f6f79a1acd3315da9a8699

[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:
f4d5b150f1 ZVISION: Show system messages when subtitles are disabled


Commit: f4d5b150f1e4b786f2f6f79a1acd3315da9a8699
    https://github.com/scummvm/scummvm/commit/f4d5b150f1e4b786f2f6f79a1acd3315da9a8699
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-29T12:34:55+02:00

Commit Message:
ZVISION: Show system messages when subtitles are disabled

Thanks to Marisa-Chan for spotting this

Changed paths:
    engines/zvision/graphics/render_manager.cpp
    engines/zvision/scripting/sidefx/music_node.cpp
    engines/zvision/scripting/sidefx/syncsound_node.cpp
    engines/zvision/video/video.cpp



diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 033d099..1b80b37 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -741,7 +741,7 @@ void RenderManager::processSubs(uint16 deltatime) {
 		}
 	}
 
-	if (redraw && _engine->getScriptManager()->getStateValue(StateKey_Subtitles) == 1) {
+	if (redraw) {
 		_subtitleSurface.fillRect(Common::Rect(_subtitleSurface.w, _subtitleSurface.h), 0);
 
 		for (SubtitleMap::iterator it = _subsList.begin(); it != _subsList.end(); it++) {
diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp
index 6be08b4..0cada6d 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 c1f1396..eec320b 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;
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp
index e67e657..0913b28 100644
--- a/engines/zvision/video/video.cpp
+++ b/engines/zvision/video/video.cpp
@@ -29,6 +29,7 @@
 #include "zvision/zvision.h"
 #include "zvision/core/clock.h"
 #include "zvision/graphics/render_manager.h"
+#include "zvision/scripting//script_manager.h"
 #include "zvision/text/subtitles.h"
 #include "zvision/video/rlf_decoder.h"
 #include "zvision/video/zork_avi_decoder.h"
@@ -75,6 +76,7 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 	uint16 y = _workingWindow.top + dst.top;
 	uint16 finalWidth = dst.width() < _workingWindow.width() ? dst.width() : _workingWindow.width();
 	uint16 finalHeight = dst.height() < _workingWindow.height() ? dst.height() : _workingWindow.height();
+	bool showSubs = (_scriptManager->getStateValue(StateKey_Subtitles) == 1);
 
 	_clock.stop();
 	vid.start();
@@ -106,7 +108,7 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
 
 		if (vid.needsUpdate()) {
 			const Graphics::Surface *frame = vid.decodeNextFrame();
-			if (sub)
+			if (sub && showSubs)
 				sub->process(vid.getCurFrame());
 
 			if (frame) {