Changed some spaces to tabs

svn-id: r19191
This commit is contained in:
Torbjörn Andersson 2005-10-20 13:08:43 +00:00
parent 532e9318d3
commit 6e6a2f3187
2 changed files with 6 additions and 6 deletions

View File

@ -148,7 +148,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) {
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 MusicHandle::readBuffer(int16 *buffer, const int numSamples) {
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 @@ int MusicHandle::readBuffer(int16 *buffer, const int numSamples) {
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;
}

View File

@ -261,7 +261,7 @@ static const char *errorMsgs[] = {
"%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"