[Scummvm-cvs-logs] scummvm master -> 6087df91be06ea4db065b02afb573a338a06be18

[Strangerke]

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:
6087df91be TSAGE: R2R - Get rid of some magic values, fix an unnoticed bug


Commit: 6087df91be06ea4db065b02afb573a338a06be18
    https://github.com/scummvm/scummvm/commit/6087df91be06ea4db065b02afb573a338a06be18
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-01T09:16:58-08:00

Commit Message:
TSAGE: R2R - Get rid of some magic values, fix an unnoticed bug

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 9b5e675..ee63cad 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -1678,7 +1678,7 @@ void Scene180::signal() {
 	case 24:
 	case 26:
 	case 46:
-		setSceneDelay((R2_GLOBALS._speechSubtitles & 1) ? 1 : 18);
+		setSceneDelay((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) ? 1 : 18);
 		break;
 
 	case 13:
@@ -4313,7 +4313,7 @@ void Scene325::signal() {
 		if (_soundCount)
 			--_soundCount;
 
-		if (!_soundCount || (R2_GLOBALS._speechSubtitles == 2)) {
+		if (!_soundCount || !(R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
 			_soundIndex = 0;
 			R2_GLOBALS._playStream.stop();
 		} else {
@@ -4700,7 +4700,7 @@ void Scene325::setMessage(int resNum, int lineNum) {
 
 		R2_GLOBALS._sceneObjects->draw();
 
-		if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles != 2)) {
+		if ((_soundCount != 0) && (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
 			_sceneMode = 15;
 			R2_GLOBALS._playStream.play(_soundQueue[_soundIndex++], this);
 		}