[Scummvm-cvs-logs] scummvm master -> 8024f406387a748718496e9592ffccb3a6a51d26
bluegr
md5 at scummvm.org
Fri Feb 25 20:46:33 CET 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:
8024f40638 SCI: Changed the fix for the intro of Longbow (bug #3044844) into a hack for that scene. Fixes the freeze in LSL6 (bug #
Commit: 8024f406387a748718496e9592ffccb3a6a51d26
https://github.com/scummvm/scummvm/commit/8024f406387a748718496e9592ffccb3a6a51d26
Author: md5 (md5 at scummvm.org)
Date: 2011-02-25T11:45:39-08:00
Commit Message:
SCI: Changed the fix for the intro of Longbow (bug #3044844) into a hack for that scene. Fixes the freeze in LSL6 (bug #3192166). Fading in KQ5 is unaffected by this.
Changed paths:
engines/sci/sound/soundcmd.cpp
diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index 0017fe0..1e6d0ae 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -445,13 +445,17 @@ void SoundCommandParser::processUpdateCues(reg_t obj) {
if (musicSlot->fadeCompleted) {
musicSlot->fadeCompleted = false;
- if (_soundVersion <= SCI_VERSION_0_LATE) {
- // We need signal for sci0 at least in iceman as well (room 14, fireworks)
- // Note: We should not set the signal here when fading is done in later
- // games. This fixes the dialog boxes disappearing too quickly in the
- // intro of Longbow (bug #3044844). It also fixes the music not fading out
- // when the bandits leave the temple in KQ5 (bug #3037594).
+ // We need signal for sci0 at least in iceman as well (room 14,
+ // fireworks).
+ // It is also needed in other games, e.g. LSL6 when talking to the
+ // receptionist (bug #3192166).
+ if (g_sci->getGameId() == GID_LONGBOW && g_sci->getEngineState()->currentRoomNumber() == 95) {
+ // HACK: Don't set a signal here in the intro of Longbow, as that makes some dialog
+ // boxes disappear too soon (bug #3044844).
+ } else {
writeSelectorValue(_segMan, obj, SELECTOR(signal), SIGNAL_OFFSET);
+ }
+ if (_soundVersion <= SCI_VERSION_0_LATE) {
processStopSound(obj, false);
} else {
if (musicSlot->stopAfterFading)
More information about the Scummvm-git-logs
mailing list