diff options
| author | Paul Gilbert | 2017-02-04 00:11:10 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-04 00:11:10 -0500 |
| commit | 7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8 (patch) | |
| tree | 46add9330d3a7cceafaf64f55a64ddae2f2dc312 | |
| parent | d10ac8689071ca1916507072b5918e6bf2b26cac (diff) | |
| download | scummvm-rg350-7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8.tar.gz scummvm-rg350-7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8.tar.bz2 scummvm-rg350-7abea34e8cd98090d1ba01cf8c2a3d50f0e8b7e8.zip | |
TITANIC: Minor fixes to CMusicObject & CMusicParser
| -rw-r--r-- | engines/titanic/sound/music_object.cpp | 4 |
1 files 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; |