From 7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 4 Feb 2017 00:11:10 -0500 Subject: TITANIC: Minor fixes to CMusicObject & CMusicParser --- engines/titanic/sound/music_object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/titanic/sound/music_object.cpp b/engines/titanic/sound/music_object.cpp index a21a29b747..7801bc5ce5 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; -- cgit v1.2.3