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

[dreammaster]

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:
bf8896f7df TSAGE: Fix for R2R conversations playing when playing voice without subtitles


Commit: bf8896f7dfcefeed408a279496d0971af2e03e07
    https://github.com/scummvm/scummvm/commit/bf8896f7dfcefeed408a279496d0971af2e03e07
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-10-21T19:49:10-07:00

Commit Message:
TSAGE: Fix for R2R conversations playing when playing voice without subtitles

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



diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 4be3212..8b6ce4a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -76,7 +76,7 @@ void VisualSpeaker::signal() {
 			_fieldF8 = 1;
 		}
 
-		if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || _soundId)
+		if ((R2_GLOBALS._speechSubtitles & SPEECH_TEXT) || !_soundId)
 			_sceneText.show();
 
 		if ((R2_GLOBALS._speechSubtitles & SPEECH_VOICE) && _soundId) {
@@ -132,6 +132,7 @@ void VisualSpeaker::dispatch() {
 		_object1.setFrame(1);
 
 		if (!(R2_GLOBALS._speechSubtitles & SPEECH_TEXT)) {
+			// Don't bother waiting for a mouse click to start the next speech segment
 			_action->setDelay(1);
 		}
 	}
@@ -244,8 +245,13 @@ void VisualSpeaker::setText(const Common::String &msg) {
 			_sceneText.hide();
 	} else {
 		if ((R2_GLOBALS._speechSubtitles & SPEECH_VOICE) && _soundId) {
-			if (!R2_GLOBALS._playStream.play(_soundId, NULL))
+			if (!R2_GLOBALS._playStream.play(_soundId, NULL)) {
+				// Couldn't play voice, so fall back on showing text
 				_sceneText.show();
+			} else {
+				_numFrames = 2;
+				_soundId = 0;
+			}
 		}
 	}
 }