[Scummvm-git-logs] scummvm master -> 5437a8fed4a7e5125aea01c6034a35b9876a0f3a

[dwatteau]

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:
5437a8fed4 SCUMM: Make Indy3 FM-TOWNS music workaround for Venice optional


Commit: 5437a8fed4a7e5125aea01c6034a35b9876a0f3a
    https://github.com/scummvm/scummvm/commit/5437a8fed4a7e5125aea01c6034a35b9876a0f3a
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2023-01-18T21:02:24+01:00

Commit Message:
SCUMM: Make Indy3 FM-TOWNS music workaround for Venice optional

Changed paths:
    engines/scumm/players/player_towns.cpp


diff --git a/engines/scumm/players/player_towns.cpp b/engines/scumm/players/player_towns.cpp
index dc180f9c195..b1a1c23d2a4 100644
--- a/engines/scumm/players/player_towns.cpp
+++ b/engines/scumm/players/player_towns.cpp
@@ -245,7 +245,7 @@ void Player_Towns_v1::startSound(int sound) {
 		velocity = velocity ? velocity >> 2 : ptr[14] >> 1;
 		uint16 len = READ_LE_UINT16(ptr) + 2;
 		playPcmTrack(sound, ptr + 6, velocity, 64, note ? note : (len > 50 ? ptr[50] : 60), READ_LE_UINT16(ptr + 10));
-	} else if (type == 1 || (_vm->_game.id == GID_INDY3 && sound == 40)) {
+	} else if (type == 1 || (_vm->_game.id == GID_INDY3 && sound == 40 && _vm->_enableEnhancements)) {
 		// WORKAROUND: Indy 3 FMTOWNS: No/distorted music in Venice
 		// The Venice music does not exist as CD audio and the original doesn't feature music
 		// in this scene. It does, however, exist as Euphony track albeit with an odd sound