[Scummvm-cvs-logs] CVS: scummvm/sword1 music.cpp,1.49,1.50 sword1.cpp,1.94,1.95

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Thu Oct 20 06:11:36 CEST 2005


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29236

Modified Files:
	music.cpp sword1.cpp 
Log Message:
Changed some spaces to tabs


Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- music.cpp	18 Oct 2005 01:30:24 -0000	1.49
+++ music.cpp	20 Oct 2005 13:08:43 -0000	1.50
@@ -148,7 +148,7 @@
 	if (!_file.isOpen()) {
 		sprintf(fileName, "%s.wav", fileBase);
 		if (_file.open(fileName))
-            _musicMode = MusicWave;
+			_musicMode = MusicWave;
 		else {
 			warning("Music file %s could not be opened", fileName);
 			return false;
@@ -208,12 +208,12 @@
 		int samplesReturned = _audioSource->readBuffer(buffer, expectedSamples);
 		buffer += samplesReturned;
 		totalSamples += samplesReturned;
-        expectedSamples -= samplesReturned;
+		expectedSamples -= samplesReturned;
 		if ((expectedSamples > 0) && _audioSource->endOfData()) {
 			debug(2, "Music reached EOF");
 			_audioSource->endOfData();
 			if (_looping) {
-                delete _audioSource; // recreate same source.
+				delete _audioSource; // recreate same source.
 				_audioSource = createAudioSource();
 			}
 			if ((!_looping) || (!_audioSource))
@@ -228,12 +228,12 @@
 		if (_fading == 0) {
 			stop();
 			// clear the rest of the buffer
-            memset(bufStart + samplePos, 0, (totalSamples - samplePos) * 2);
+			memset(bufStart + samplePos, 0, (totalSamples - samplePos) * 2);
 			return samplePos;
 		}
 	}
 	while ((_fading < 0) && (samplePos < totalSamples)) { // fade up
-        bufStart[samplePos] = -(bufStart[samplePos] * --_fading) / _fadeSamples;
+		bufStart[samplePos] = -(bufStart[samplePos] * --_fading) / _fadeSamples;
 		if (_fading <= -_fadeSamples)
 			_fading = 0;
 	}

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- sword1.cpp	18 Oct 2005 01:30:24 -0000	1.94
+++ sword1.cpp	20 Oct 2005 13:08:43 -0000	1.95
@@ -261,7 +261,7 @@
 	"%d important files are missing, the game can't start without them.\n"
 	"Please copy these files from their corresponding CDs:\n",
 
-    "The file \"%s\" is missing.\n"
+	"The file \"%s\" is missing.\n"
 	"Even though the game may initially seem to\n"
 	"work fine, it will crash when it needs the\n"
 	"data from this file and you will be thrown back to your last savegame.\n"





More information about the Scummvm-git-logs mailing list