aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound/midiparser_sci.cpp
diff options
context:
space:
mode:
authorm-kiewitz2013-09-15 23:21:23 +0200
committerm-kiewitz2013-09-15 23:21:23 +0200
commit0fd15e6db3d335ed1cbf36e7735abd2691d5096e (patch)
tree927ed67bce2e72f3772ee675535d5549916af67c /engines/sci/sound/midiparser_sci.cpp
parentd9b0658165e3c4596a20a6d3984cf51569a0d2e4 (diff)
downloadscummvm-rg350-0fd15e6db3d335ed1cbf36e7735abd2691d5096e.tar.gz
scummvm-rg350-0fd15e6db3d335ed1cbf36e7735abd2691d5096e.tar.bz2
scummvm-rg350-0fd15e6db3d335ed1cbf36e7735abd2691d5096e.zip
SCI: fix tabs in last commit
Diffstat (limited to 'engines/sci/sound/midiparser_sci.cpp')
-rw-r--r--engines/sci/sound/midiparser_sci.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 2570322e73..f0451449f5 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -442,19 +442,19 @@ void MidiParser_SCI::sendToDriver(uint32 midi) {
void MidiParser_SCI::parseNextEvent(EventInfo &info) {
// Set signal AFTER waiting for delta, otherwise we would set signal too soon resulting in all sorts of bugs
if (_dataincAdd) {
- _dataincAdd = false;
- _pSnd->dataInc += _dataincToAdd;
- _pSnd->signal = 0x7f + _pSnd->dataInc;
+ _dataincAdd = false;
+ _pSnd->dataInc += _dataincToAdd;
+ _pSnd->signal = 0x7f + _pSnd->dataInc;
debugC(4, kDebugLevelSound, "datainc %04x", _dataincToAdd);
}
if (_signalSet) {
- _signalSet = false;
+ _signalSet = false;
_pSnd->setSignal(_signalToSet);
- debugC(4, kDebugLevelSound, "signal %04x", _signalToSet);
+ debugC(4, kDebugLevelSound, "signal %04x", _signalToSet);
}
if (_jumpToHoldTick) {
- _jumpToHoldTick = false;
+ _jumpToHoldTick = false;
jumpToTick(_loopTick, false, false);
}
@@ -497,10 +497,10 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
// immediately there.
if (_soundVersion <= SCI_VERSION_0_LATE ||
_position._playTick || info.delta) {
- if (!_pSnd->inFastForward) {
- _signalSet = true;
- _signalToSet = info.basic.param1;
- }
+ if (!_pSnd->inFastForward) {
+ _signalSet = true;
+ _signalToSet = info.basic.param1;
+ }
}
} else {
_loopTick = _position._playTick + info.delta;
@@ -554,22 +554,22 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
}
break;
case kUpdateCue:
- if (!_pSnd->inFastForward) {
- _dataincAdd = true;
- switch (_soundVersion) {
- case SCI_VERSION_0_EARLY:
- case SCI_VERSION_0_LATE:
- _dataincToAdd = info.basic.param2;
- break;
- case SCI_VERSION_1_EARLY:
- case SCI_VERSION_1_LATE:
- case SCI_VERSION_2_1:
- _dataincToAdd = 1;
- break;
- default:
- error("unsupported _soundVersion");
- }
- }
+ if (!_pSnd->inFastForward) {
+ _dataincAdd = true;
+ switch (_soundVersion) {
+ case SCI_VERSION_0_EARLY:
+ case SCI_VERSION_0_LATE:
+ _dataincToAdd = info.basic.param2;
+ break;
+ case SCI_VERSION_1_EARLY:
+ case SCI_VERSION_1_LATE:
+ case SCI_VERSION_2_1:
+ _dataincToAdd = 1;
+ break;
+ default:
+ error("unsupported _soundVersion");
+ }
+ }
break;
case kResetOnPause:
_resetOnPause = info.basic.param2;