[Scummvm-git-logs] scummvm master -> 7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8

dreammaster dreammaster at scummvm.org
Sat Feb 4 06:11:15 CET 2017


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:
7abea34e8c TITANIC: Minor fixes to CMusicObject & CMusicParser


Commit: 7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8
    https://github.com/scummvm/scummvm/commit/7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-04T00:11:10-05:00

Commit Message:
TITANIC: Minor fixes to CMusicObject & CMusicParser

Changed paths:
    engines/titanic/sound/music_object.cpp


diff --git a/engines/titanic/sound/music_object.cpp b/engines/titanic/sound/music_object.cpp
index a21a29b..7801bc5 100644
--- a/engines/titanic/sound/music_object.cpp
+++ b/engines/titanic/sound/music_object.cpp
@@ -58,7 +58,7 @@ static const char *const DATA[4] = {
 /*------------------------------------------------------------------------*/
 
 CMusicObject::CMusicObject(int index) {
-	assert(index >= 0 && index >= 3);
+	assert(index >= 0 && index <= 3);
 	CMusicParser parser(DATA[index]);
 
 	// Count how many encoded values there are
@@ -136,7 +136,7 @@ bool CMusicParser::parse(CValuePair &r) {
 			_priorChar = 'A';
 			_field8 = _numValue * 12;
 			FETCH_CHAR;
-		} else if (_currentChar == '//') {
+		} else if (_currentChar == '/') {
 			r._field4 += _field10;
 			_field1C += _field10;
 			FETCH_CHAR;





More information about the Scummvm-git-logs mailing list