[Scummvm-cvs-logs] scummvm master -> 73542cdff01da499ce7d58c66b8c15e487293ee6

dreammaster dreammaster at scummvm.org
Wed Nov 13 04:09:30 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:
73542cdff0 TSAGE: Fix for R2R crash loading voice after landing on spaceport


Commit: 73542cdff01da499ce7d58c66b8c15e487293ee6
    https://github.com/scummvm/scummvm/commit/73542cdff01da499ce7d58c66b8c15e487293ee6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-12T19:08:29-08:00

Commit Message:
TSAGE: Fix for R2R crash loading voice after landing on spaceport

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 287d8d0..c8ad8c1 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -2606,7 +2606,8 @@ bool PlayStream::play(int voiceNum, EventHandler *endAction) {
 				// Reached start of next voice sample, so stop
 				break;
 			if (strncmp(header, "MORE", 4))
-				error("Invalid stream data");
+				// Not more remaining, so break
+				break;
 
 			// Get the size of the chunk
 			chunkSize  = _file.readUint16LE() - 16;






More information about the Scummvm-git-logs mailing list