Permalink
Browse files

SCI: Fix GK1 demo sounds

This is a regression from 9fd66de and, despite the commit message, was *not* fixed by 1736345
  • Loading branch information...
1 parent dac35ac commit 865c54c125f0b5b0af1cd251cf07ec596dd4631a @clone2727 clone2727 committed Mar 5, 2012
Showing with 6 additions and 7 deletions.
  1. +6 −7 engines/sci/sound/soundcmd.cpp
@@ -39,15 +39,16 @@ SoundCommandParser::SoundCommandParser(ResourceManager *resMan, SegManager *segM
#ifdef ENABLE_SFX_TYPE_SELECTION
// Check if the user wants synthesized or digital sound effects in SCI1.1
- // or later games
- _useDigitalSFX = ConfMan.getBool("multi_midi");
+ // games based on the multi_midi config setting
// In SCI2 and later games, this check should always be true - 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 (getSciVersion() >= SCI_VERSION_2)
- _useDigitalSFX = true;
+ // The GK1 demo (very late SCI1.1) does the same thing
+ // TODO: Check the QFG4 demo
+
+ _useDigitalSFX = (getSciVersion() >= SCI_VERSION_2 || g_sci->getGameId() == GID_GK1 || ConfMan.getBool("multi_midi"));
#else
// Always prefer digital sound effects
_useDigitalSFX = true;
@@ -93,9 +94,7 @@ void SoundCommandParser::initSoundResource(MusicEntry *newSound) {
// effects map)
bool checkAudioResource = getSciVersion() >= SCI_VERSION_1_1;
// Hoyle 4 has garbled audio resources in place of the sound resources.
- // The demo of GK1 has no alternate sound effects.
- if ((g_sci->getGameId() == GID_HOYLE4) ||
- (g_sci->getGameId() == GID_GK1 && g_sci->isDemo()))
+ if (g_sci->getGameId() == GID_HOYLE4)
checkAudioResource = false;
if (checkAudioResource && _resMan->testResource(ResourceId(kResourceTypeAudio, newSound->resourceId))) {

0 comments on commit 865c54c

Please sign in to comment.