[Scummvm-cvs-logs] scummvm master -> b17d424257bccfa355a3a43d4308f266c12f8698
bluegr
md5 at scummvm.org
Mon Oct 10 00:48:07 CEST 2011
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:
b17d424257 SCI: Fixed menu music in GK1 when multi MIDI is disabled
Commit: b17d424257bccfa355a3a43d4308f266c12f8698
https://github.com/scummvm/scummvm/commit/b17d424257bccfa355a3a43d4308f266c12f8698
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-09T15:41:09-07:00
Commit Message:
SCI: Fixed menu music in GK1 when multi MIDI is disabled
A regression from commit 9fd66de
Changed paths:
engines/sci/sound/soundcmd.cpp
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index a91b103..b4776b3 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -81,8 +81,14 @@ void SoundCommandParser::initSoundResource(MusicEntry *newSound) {
// on soundblaster. FIXME: check, why this is
if (checkAudioResource && _resMan->testResource(ResourceId(kResourceTypeAudio, newSound->resourceId))) {
- // Found a relevant audio resource, create an audio stream
- if (_bMultiMidi || !newSound->soundRes) {
+ // Found a relevant audio resource, create an audio stream if there is
+ // no associated sound resource, or if both resources exist and the
+ // user wants the digital version. In SCI2 and later games, this check
+ // doesn't apply - there was always only one version of each sound
+ // effect or digital music track (e.g. the menu music in GK1 - there is
+ // a sound effect with the same resource number, but it's totally
+ // unrelated to the menu music).
+ if (_bMultiMidi || !newSound->soundRes || getSciVersion() >= SCI_VERSION_2) {
int sampleLen;
newSound->pStreamAud = _audio->getAudioStream(newSound->resourceId, 65535, &sampleLen);
newSound->soundType = Audio::Mixer::kSpeechSoundType;
More information about the Scummvm-git-logs
mailing list