diff options
| author | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
| commit | aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch) | |
| tree | 95f119e687a666f65aad5041910c43bdfd4f2929 /engines/saga | |
| parent | ec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff) | |
| download | scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2 scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip | |
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'engines/saga')
| -rw-r--r-- | engines/saga/music.cpp | 4 | ||||
| -rw-r--r-- | engines/saga/sound.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index 38a18671b8..afe4fb2a3b 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -300,11 +300,11 @@ void Music::play(uint32 resourceId, MusicFlags flags) { Common::File *musicFile = _digitalMusicContext->getFile(resData); int offs = (_digitalMusicContext->isCompressed()) ? 9 : 0; - Common::SeekableSubReadStream *musicStream = new Common::SeekableSubReadStream(musicFile, + Common::SeekableSubReadStream *musicStream = new Common::SeekableSubReadStream(musicFile, (uint32)resData->offset + offs, (uint32)resData->offset + resData->size - offs); if (!_digitalMusicContext->isCompressed()) { - byte musicFlags = Audio::FLAG_STEREO | + byte musicFlags = Audio::FLAG_STEREO | Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN; Audio::RawDiskStreamAudioBlock audioBlocks[1]; audioBlocks[0].pos = 0; diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index d87c025719..642b07eb07 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -69,7 +69,7 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, const SoundBuffer &buffe Audio::RewindableAudioStream *stream = 0; - Audio::Mixer::SoundType soundType = (handleType == kVoiceHandle) ? + Audio::Mixer::SoundType soundType = (handleType == kVoiceHandle) ? Audio::Mixer::kSpeechSoundType : Audio::Mixer::kSFXSoundType; if (!buffer.isCompressed) { |