diff options
| author | Alyssa Milburn | 2012-09-07 22:57:14 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-09-07 23:04:34 +0200 |
| commit | f08978a0750e6a6a5dbea1f8fe5d80267049f8c8 (patch) | |
| tree | 2e13589ef3dc97ea5a7b935277ed2cb5d739e67e /engines/scumm | |
| parent | 5684475169a371f0b09c9550901279ade10f5275 (diff) | |
| download | scummvm-rg350-f08978a0750e6a6a5dbea1f8fe5d80267049f8c8.tar.gz scummvm-rg350-f08978a0750e6a6a5dbea1f8fe5d80267049f8c8.tar.bz2 scummvm-rg350-f08978a0750e6a6a5dbea1f8fe5d80267049f8c8.zip | |
JANITORIAL: Remove underscores from MidiParser variable names.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/midiparser_ro.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/midiparser_ro.cpp b/engines/scumm/midiparser_ro.cpp index 1a31d1ca82..8549a9262d 100644 --- a/engines/scumm/midiparser_ro.cpp +++ b/engines/scumm/midiparser_ro.cpp @@ -62,13 +62,13 @@ void MidiParser_RO::parseNextEvent (EventInfo &info) { info.delta = 0; do { - info.start = _position._play_pos; - info.event = *(_position._play_pos++); + info.start = _position._playPos; + info.event = *(_position._playPos++); if (info.command() == 0xA) { ++_lastMarkerCount; info.event = 0xF0; } else if (info.event == 0xF0 || info.event == 0xF1) { - byte delay = *(_position._play_pos++); + byte delay = *(_position._playPos++); info.delta += delay; if (info.event == 0xF1) { // This event is, as far as we have been able @@ -95,16 +95,16 @@ void MidiParser_RO::parseNextEvent (EventInfo &info) { if (info.event < 0x80) return; - _position._running_status = info.event; + _position._runningStatus = info.event; switch (info.command()) { case 0xC: - info.basic.param1 = *(_position._play_pos++); + info.basic.param1 = *(_position._playPos++); info.basic.param2 = 0; break; case 0x8: case 0x9: case 0xB: - info.basic.param1 = *(_position._play_pos++); - info.basic.param2 = *(_position._play_pos++); + info.basic.param1 = *(_position._playPos++); + info.basic.param2 = *(_position._playPos++); if (info.command() == 0x9 && info.basic.param2 == 0) info.event = info.channel() | 0x80; info.length = 0; @@ -133,7 +133,7 @@ bool MidiParser_RO::loadMusic (byte *data, uint32 size) { return false; } - _num_tracks = 1; + _numTracks = 1; _ppqn = 120; _tracks[0] = pos + 2; _markerCount = _lastMarkerCount = 0; |