diff options
| author | Willem Jan Palenstijn | 2013-04-06 20:45:01 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-04-06 20:46:15 +0200 |
| commit | d0d9894b22cbd0030ceee66c40f4d8f6bff7ff16 (patch) | |
| tree | 576f5b87c6f7c083f7fe3ed0c41c76eee6bc8016 /engines/sci/sound/soundcmd.cpp | |
| parent | 6f3716ae749829b5f7b446f4a97eb244570a7961 (diff) | |
| download | scummvm-rg350-d0d9894b22cbd0030ceee66c40f4d8f6bff7ff16.tar.gz scummvm-rg350-d0d9894b22cbd0030ceee66c40f4d8f6bff7ff16.tar.bz2 scummvm-rg350-d0d9894b22cbd0030ceee66c40f4d8f6bff7ff16.zip | |
SCI: Revert "Fixed fading-related bugs #3267956 and #3041738"
This reverts commit bfef0f5a6fabdef5bb42cffd8b078d4511cf2a80.
Diffstat (limited to 'engines/sci/sound/soundcmd.cpp')
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 737a130665..fb4564d859 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -377,14 +377,6 @@ reg_t SoundCommandParser::kDoSoundFade(int argc, reg_t *argv, reg_t acc) { return acc; } - // If the current volume of the slot is the same as the target volume, - // return without performing any fading. This fixes the music in room - // 406 in KQ6 (bug #3267956), where the game scripts ask for the background - // music to be played, and then faded to volume 127 (but the music is - // already at volume 127) and subsequently stopped. - if (argc >= 4 && musicSlot->volume == CLIP<uint16>(argv[1].toUint16(), 0, MUSIC_VOLUME_MAX)) - return acc; - switch (argc) { case 1: // SCI0 // SCI0 fades out all the time and when fadeout is done it will also |