Ticket #8038: fadefix.diff

scummvm/scumm/imuse.cpp

@@ -170 +170 @@
         int query_param(int param);
 
         int fade_vol(byte vol, int time);
+        bool is_fading_out();
         void sequencer_timer();
 };
 
@@ -1172 +1173 @@
         Player *player;
 
         for (i = ARRAYSIZE(_players), player = _players; i != 0; i--, player++) {
-                if (player->_active && player->_id == (uint16)sound)
+                if (player->_active && player->_id == (uint16)sound) {
+                        // Assume that anyone asking for the sound status is
+                        // really asking "is it ok if I start playing this
+                        // sound now?" So if the sound is about to fade out,
+                        // shut it down and pretend it wasn't playing.
+                        if (player->is_fading_out()) {
+                                player->clear();
+                                continue;
+                        }
                         return 1;
+                }
         }
         return get_queue_sound_status(sound);
 }
@@ -1781 +1791 @@
         return 0;
 }
 
+bool Player::is_fading_out()
+{
+        VolumeFader *vf = _se->_volume_fader;
+        int i;
+
+        for (i = 0; i < 8; i++, vf++) {
+                if (vf->active && vf->direction < 0 && vf->player == this)
+                        return true;
+        }
+        return false;
+}
+
 void Player::clear()
 {
         uninit_seq();