[Scummvm-git-logs] scummvm master -> c6f4da19ceb061a2834daddd558ced63f5c3add4
dreammaster
dreammaster at scummvm.org
Sat Feb 4 21:20:16 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:
c6f4da19ce TITANIC: Fix CMusicParser to produce correct results
Commit: c6f4da19ceb061a2834daddd558ced63f5c3add4
https://github.com/scummvm/scummvm/commit/c6f4da19ceb061a2834daddd558ced63f5c3add4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-04T15:20:11-05:00
Commit Message:
TITANIC: Fix CMusicParser to produce correct results
Changed paths:
engines/titanic/sound/music_object.cpp
engines/titanic/sound/music_object.h
diff --git a/engines/titanic/sound/music_object.cpp b/engines/titanic/sound/music_object.cpp
index 7801bc5..0b6951b 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 a4b1110..67fef67 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 {
More information about the Scummvm-git-logs
mailing list