diff options
| author | Max Horn | 2003-09-05 22:09:56 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-05 22:09:56 +0000 |
| commit | 3aa8454efaf6674ceade07182ae8c4b2d7f12143 (patch) | |
| tree | 6fe7d250458de6e52caf6b3cfdad770d92574f24 /sky | |
| parent | 0045dfe9c61ccff708d4b93eaa699ea09cdec1aa (diff) | |
| download | scummvm-rg350-3aa8454efaf6674ceade07182ae8c4b2d7f12143.tar.gz scummvm-rg350-3aa8454efaf6674ceade07182ae8c4b2d7f12143.tar.bz2 scummvm-rg350-3aa8454efaf6674ceade07182ae8c4b2d7f12143.zip | |
moved the sound ID param in playRaw before volume/pan
svn-id: r10023
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/intro.cpp | 6 | ||||
| -rw-r--r-- | sky/sound.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sky/intro.cpp b/sky/intro.cpp index 5c4ab9968f..4ed7bf7fa3 100644 --- a/sky/intro.cpp +++ b/sky/intro.cpp @@ -718,7 +718,7 @@ bool SkyIntro::nextPart(uint16 *&data) { // directly, but this will have to do for now. memset(vData, 127, sizeof(struct dataFileHeader)); _mixer->playRaw(&_voice, vData, _skyDisk->_lastLoadedFileSize, 11025, - SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, 255, 0, SOUND_VOICE); + SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_UNSIGNED, SOUND_VOICE); return true; case WAITVOICE: while (_voice) @@ -735,12 +735,12 @@ bool SkyIntro::nextPart(uint16 *&data) { case LOOPBG: _mixer->stopID(SOUND_BG); _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, - SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, 255, 0, SOUND_BG); + SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_LOOP, SOUND_BG); return true; case PLAYBG: _mixer->stopID(SOUND_BG); _mixer->playRaw(&_bgSfx, _bgBuf + 256, _bgSize - 768, 11025, - SoundMixer::FLAG_UNSIGNED, 255, 0, SOUND_BG); + SoundMixer::FLAG_UNSIGNED, SOUND_BG); return true; case STOPBG: _mixer->stopID(SOUND_BG); diff --git a/sky/sound.cpp b/sky/sound.cpp index 50de6293b3..0488557506 100644 --- a/sky/sound.cpp +++ b/sky/sound.cpp @@ -1054,7 +1054,7 @@ int SkySound::playSound(uint32 id, byte *sound, uint32 size, PlayingSoundHandle memcpy(buffer, sound+sizeof(struct dataFileHeader), size); _mixer->stopID(id); - return _mixer->playRaw(handle, buffer, size, 11025, flags, 255, 0, id); + return _mixer->playRaw(handle, buffer, size, 11025, flags, id); } void SkySound::loadSection(uint8 pSection) { @@ -1130,9 +1130,9 @@ void SkySound::playSound(uint16 sound, uint16 volume, uint8 channel) { _mixer->setVolume(volume); if (channel == 0) - _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, 255, 0, SOUND_CH0, loopSta, loopEnd); + _mixer->playRaw(&_ingameSound0, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH0, loopSta, loopEnd); else - _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, 255, 0, SOUND_CH1, loopSta, loopEnd); + _mixer->playRaw(&_ingameSound1, _soundData + dataOfs, dataSize, sampleRate, flags, SOUND_CH1, loopSta, loopEnd); } void SkySound::fnStartFx(uint32 sound, uint8 channel) { @@ -1251,6 +1251,6 @@ bool SkySound::startSpeech(uint16 textNum) { free(speechData); _mixer->stopID(SOUND_SPEECH); - _mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 255, 0, SOUND_SPEECH); + _mixer->playRaw(&_ingameSpeech, playBuffer, speechSize, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, SOUND_SPEECH); return true; } |