[Scummvm-git-logs] scummvm master -> 3d9a8862046acb84feb9bf6256c21b492cd67ff0

[aquadran]

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:
3d9a886204 SCUMM: COMI: prevent SFX and VOICE from using fade-in (#2631)


Commit: 3d9a8862046acb84feb9bf6256c21b492cd67ff0
    https://github.com/scummvm/scummvm/commit/3d9a8862046acb84feb9bf6256c21b492cd67ff0
Author: AndywinXp (andywinxp at gmail.com)
Date: 2020-11-22T19:42:18+01:00

Commit Message:
SCUMM: COMI: prevent SFX and VOICE from using fade-in (#2631)

* SCUMM: COMI: prevent SFX and VOICE from using fade-in

Changed paths:
    engines/scumm/imuse_digi/dimuse_track.cpp


diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index 6107b02ef0..235209b5e4 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -171,7 +171,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType,
 				track->regionOffset -= track->regionOffset >= (track->feedSize / _callbackFps) ? (track->feedSize / _callbackFps) : 0;
 			}
 		}
-		if (_vm->_game.id == GID_CMI) {
+		if (_vm->_game.id == GID_CMI && (track->volGroupId == IMUSE_VOLGRP_MUSIC)) {
 			// Fade in the new track
 			track->vol = 0;
 			track->volFadeDelay = fadeDelay;
@@ -441,6 +441,7 @@ int IMuseDigital::transformVolumeLinearToEqualPow(int volume, int mode) {
 			break;
 		case 6:  // Half sine curve
 			eqPowValue = (1.0 - cos(mappedValue * M_PI)) / 2.0;
+			break;
 		default: // Fallback to linear
 			eqPowValue = mappedValue;
 			break;