diff options
| author | Paul Gilbert | 2017-02-04 15:20:11 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-02-04 15:20:11 -0500 |
| commit | c6f4da19ceb061a2834daddd558ced63f5c3add4 (patch) | |
| tree | dd014954581acdee03baba53f560d959a7e7ab71 /engines | |
| parent | a8c9e47d66603275af4c5b5d1b5de85d6cbe7ee9 (diff) | |
| download | scummvm-rg350-c6f4da19ceb061a2834daddd558ced63f5c3add4.tar.gz scummvm-rg350-c6f4da19ceb061a2834daddd558ced63f5c3add4.tar.bz2 scummvm-rg350-c6f4da19ceb061a2834daddd558ced63f5c3add4.zip | |
TITANIC: Fix CMusicParser to produce correct results
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/sound/music_object.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/sound/music_object.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/titanic/sound/music_object.cpp b/engines/titanic/sound/music_object.cpp index 7801bc5ce5..0b6951b2d9 100644 --- a/engines/titanic/sound/music_object.cpp +++ b/engines/titanic/sound/music_object.cpp @@ -150,11 +150,11 @@ bool CMusicParser::parse(CValuePair &r) { if (_flag) break; + _flag = true; r._field0 = 0x7FFFFFFF; r._field4 = _field10; _field14 = 0; _field1C += _field10; - _field10 = 1; FETCH_CHAR; } else if (_currentChar == '|') { _field1C = 0; diff --git a/engines/titanic/sound/music_object.h b/engines/titanic/sound/music_object.h index a4b11105ea..67fef67b85 100644 --- a/engines/titanic/sound/music_object.h +++ b/engines/titanic/sound/music_object.h @@ -31,6 +31,7 @@ namespace Titanic { struct CValuePair { uint _field0; uint _field4; + CValuePair() : _field0(0), _field4(0) {} }; class CMusicObject { |