[Scummvm-git-logs] scummvm master -> 017056fb2ea3e95c556749285985b4700e274ec6

dreammaster dreammaster at scummvm.org
Thu Feb 9 04:10:24 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:
017056fb2e TITANIC: Fix for CMusicParser parsing


Commit: 017056fb2ea3e95c556749285985b4700e274ec6
    https://github.com/scummvm/scummvm/commit/017056fb2ea3e95c556749285985b4700e274ec6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-08T22:10:15-05:00

Commit Message:
TITANIC: Fix for CMusicParser parsing

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 3e8d887..edf652a 100644
--- a/engines/titanic/sound/music_object.cpp
+++ b/engines/titanic/sound/music_object.cpp
@@ -170,8 +170,8 @@ bool CMusicParser::parse(CValuePair &r) {
 				r._field0 = _field8;
 			} else if (_currentChar >= 'a' && _currentChar <= 'g') {
 				val1 -= val2;
-				if (val1 < 0)
-					val1 = 12;
+				if (val1 >= 0)
+					val1 -= 12;
 				r._field0 = _field8 + val1;
 			} else if (_currentChar >= 'A' && _currentChar <= 'G') {
 				val1 -= val2;





More information about the Scummvm-git-logs mailing list