[Scummvm-cvs-logs] scummvm master -> 3b8b3c4caffc8a19a7ad4c4fa55bad712f0e5fce

[DrMcCoy]

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:
3b8b3c4caf GOB: Fix a failed assert in Litte Red Riding Hood


Commit: 3b8b3c4caffc8a19a7ad4c4fa55bad712f0e5fce
    https://github.com/scummvm/scummvm/commit/3b8b3c4caffc8a19a7ad4c4fa55bad712f0e5fce
Author: Sven Hesse (drmccoy at users.sourceforge.net)
Date: 2012-06-14T14:40:18-07:00

Commit Message:
GOB: Fix a failed assert in Litte Red Riding Hood

Changed paths:
    engines/gob/inter_v1.cpp



diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index 6fc472a..3652637 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1584,14 +1584,13 @@ void Inter_v1::o1_waitEndPlay(OpFuncParams &params) {
 }
 
 void Inter_v1::o1_playComposition(OpFuncParams &params) {
-	int16 composition[50];
-	int16 dataVar;
-	int16 freqVal;
+	int16 dataVar = _vm->_game->_script->readVarIndex();
+	int16 freqVal = _vm->_game->_script->readValExpr();
 
-	dataVar = _vm->_game->_script->readVarIndex();
-	freqVal = _vm->_game->_script->readValExpr();
+	int16 composition[50];
+	int maxEntries = MIN<int>(50, (_variables->getSize() - dataVar) / 4);
 	for (int i = 0; i < 50; i++)
-		composition[i] = (int16) VAR_OFFSET(dataVar + i * 4);
+		composition[i] = (i < maxEntries) ? ((int16) VAR_OFFSET(dataVar + i * 4)) : -1;
 
 	_vm->_sound->blasterPlayComposition(composition, freqVal);
 }