diff options
author | Paul Gilbert | 2017-02-12 21:39:30 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-02-12 21:39:30 -0500 |
commit | 8fec9daff2f3de1c0b5971373382a82a2ceb54d3 (patch) | |
tree | 7553b3de4828f4a23b7c74801ad4eb4348c23d7d /engines/titanic/sound/music_song.cpp | |
parent | bb840c9ec205d4c6a94d73c107f520d557983791 (diff) | |
download | scummvm-rg350-8fec9daff2f3de1c0b5971373382a82a2ceb54d3.tar.gz scummvm-rg350-8fec9daff2f3de1c0b5971373382a82a2ceb54d3.tar.bz2 scummvm-rg350-8fec9daff2f3de1c0b5971373382a82a2ceb54d3.zip |
TITANIC: Further CMusicRoomHandler renamings
Diffstat (limited to 'engines/titanic/sound/music_song.cpp')
-rw-r--r-- | engines/titanic/sound/music_song.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/titanic/sound/music_song.cpp b/engines/titanic/sound/music_song.cpp index 5894f344af..a5527da356 100644 --- a/engines/titanic/sound/music_song.cpp +++ b/engines/titanic/sound/music_song.cpp @@ -56,11 +56,11 @@ CMusicSong::CMusicSong(int index) { for (int idx = 0; idx < count; ++idx) { CValuePair &vp = _data[idx]; - if (vp._field0 != 0x7FFFFFFF) { - if (vp._field0 < _minVal) - _minVal = vp._field0; - if (vp._field0 > maxVal) - maxVal = vp._field0; + if (vp._data != 0x7FFFFFFF) { + if (vp._data < _minVal) + _minVal = vp._data; + if (vp._data > maxVal) + maxVal = vp._data; } } @@ -128,7 +128,7 @@ bool CSongParser::parse(CValuePair &r) { break; _flag = true; - r._field0 = 0x7FFFFFFF; + r._data = 0x7FFFFFFF; r._length = _field10; _field14 = 0; _field1C += _field10; @@ -145,17 +145,17 @@ bool CSongParser::parse(CValuePair &r) { bool flag = true; if (_currentChar == _priorChar) { - r._field0 = _field8; + r._data = _field8; } else if (_currentChar >= 'a' && _currentChar <= 'g') { val1 -= val2; if (val1 >= 0) val1 -= 12; - r._field0 = _field8 + val1; + r._data = _field8 + val1; } else if (_currentChar >= 'A' && _currentChar <= 'G') { val1 -= val2; if (val1 <= 0) val1 += 12; - r._field0 = _field8 + val1; + r._data = _field8 + val1; } else { flag = false; } @@ -163,9 +163,9 @@ bool CSongParser::parse(CValuePair &r) { if (flag) { r._length = _field10; _field1C += _field10; - _field8 = r._field0; + _field8 = r._data; _priorChar = _currentChar; - r._field0 += _field14; + r._data += _field14; _field14 = 0; _flag = true; } |