[Scummvm-cvs-logs] scummvm master -> 0fd15e6db3d335ed1cbf36e7735abd2691d5096e

[m-kiewitz]

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:
0fd15e6db3 SCI: fix tabs in last commit


Commit: 0fd15e6db3d335ed1cbf36e7735abd2691d5096e
    https://github.com/scummvm/scummvm/commit/0fd15e6db3d335ed1cbf36e7735abd2691d5096e
Author: m-kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2013-09-15T14:21:23-07:00

Commit Message:
SCI: fix tabs in last commit

Changed paths:
    engines/sci/sound/midiparser_sci.cpp
    engines/sci/sound/music.cpp
    engines/sci/sound/music.h



diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 2570322..f045144 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;
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 7fdcac2..1628a22 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -521,12 +521,12 @@ void SciMusic::soundPlay(MusicEntry *pSnd) {
 				pSnd->pMidiParser->jumpToTick(0);
 			else {
 				// Fast forward to the last position and perform associated events when loading
-                pSnd->inFastForward = true;
-                // we set this flag, so that the midiparser doesn't set any signals for scripts
-                // if we don't do this, at least accessing the debugger will reset previously set signals
+				pSnd->inFastForward = true;
+				// we set this flag, so that the midiparser doesn't set any signals for scripts
+				// if we don't do this, at least accessing the debugger will reset previously set signals
 				pSnd->pMidiParser->jumpToTick(pSnd->ticker, true, true, true);
-                pSnd->inFastForward = false;
-            }
+				pSnd->inFastForward = false;
+			}
 
 			// Restore looping and hold
 			pSnd->loop = prevLoop;
@@ -765,7 +765,7 @@ MusicEntry::MusicEntry() {
 	resourceId = 0;
 
 	isQueued = false;
-    inFastForward = false;
+	inFastForward = false;
 
 	dataInc = 0;
 	ticker = 0;
diff --git a/engines/sci/sound/music.h b/engines/sci/sound/music.h
index 79de71d..5924a0f 100644
--- a/engines/sci/sound/music.h
+++ b/engines/sci/sound/music.h
@@ -65,7 +65,7 @@ public:
 	uint16 resourceId;
 
 	bool isQueued; // for SCI0 only!
-    bool inFastForward; // if we are currently fast-forwarding (disables any signals to scripts)
+	bool inFastForward; // if we are currently fast-forwarding (disables any signals to scripts)
 
 	uint16 dataInc;
 	uint16 ticker;