[Scummvm-cvs-logs] scummvm master -> 5e3cbacd6d0349ee5658249267aaf627a2844e08

dreammaster dreammaster at scummvm.org
Tue Nov 12 04:11:56 CET 2013


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:
5e3cbacd6d TSAGE: Bugfix for R2R voice playback of Louis Wu Infodisk


Commit: 5e3cbacd6d0349ee5658249267aaf627a2844e08
    https://github.com/scummvm/scummvm/commit/5e3cbacd6d0349ee5658249267aaf627a2844e08
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-11T19:11:22-08:00

Commit Message:
TSAGE: Bugfix for R2R voice playback of Louis Wu Infodisk

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 f8e1712..d326058 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
@@ -785,7 +785,7 @@ void Scene125::signal() {
 	case 12:
 		if (_soundCount > 0)
 			--_soundCount;
-		if (!_soundCount || (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
+		if (!_soundCount || !(R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
 			_soundIndex = 0;
 			R2_GLOBALS._playStream.stop();
 		} else {
@@ -1172,7 +1172,7 @@ void Scene125::setDetails(int resNum, int lineNum) {
 
 		if ((_soundCount > 0) && (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
 			_sceneMode = 12;
-			R2_GLOBALS._playStream.play(_soundIndexes[_soundIndex], this);
+			R2_GLOBALS._playStream.play(_soundIndexes[_soundIndex++], this);
 		}
 	} else {
 		// Passed the start or end of the message set, so return to the menu






More information about the Scummvm-git-logs mailing list