[Scummvm-cvs-logs] scummvm master -> fb61f649035f8d823f4afa5302487d9a30009403

[athrxx]

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:
fb61f64903 SCUMM: WORKAROUND for bug #1873 INDY3 FMTOWNS: Music in Venice is distorted


Commit: fb61f649035f8d823f4afa5302487d9a30009403
    https://github.com/scummvm/scummvm/commit/fb61f649035f8d823f4afa5302487d9a30009403
Author: athrxx (athrxx at scummvm.org)
Date: 2015-11-10T18:00:01+01:00

Commit Message:
SCUMM: WORKAROUND for bug #1873 INDY3 FMTOWNS: Music in Venice is distorted

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 6799388..d540fc4 100644
--- a/engines/scumm/players/player_towns.cpp
+++ b/engines/scumm/players/player_towns.cpp
@@ -255,7 +255,9 @@ void Player_Towns_v1::startSound(int sound) {
 		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) {
+		// WORKAROUND for bug #1873 INDY3 FMTOWNS: Music in Venice is distorted
+		// The resource for sound 40 accidently sets the sound type to 255 instead of 1.
+	} else if (type == 1 || (_vm->_game.id == GID_INDY3 && sound == 40)) {
 		playEuphonyTrack(sound, ptr + 6);
 
 	} else if (type == 2) {
@@ -410,7 +412,9 @@ void Player_Towns_v1::restoreAfterLoad() {
 		if (_vm->_game.version != 3)
 			ptr += 2;
 
-		if (ptr[7] == 1) {
+		// WORKAROUND for bug #1873 INDY3 FMTOWNS: Music in Venice is distorted
+		// The resource for sound 40 accidently sets the sound type to 255 instead of 1.
+		if (ptr[7] == 1 || (_vm->_game.id == GID_INDY3 && _eupCurrentSound == 40)) {
 			setSoundVolume(_eupCurrentSound, _eupVolLeft, _eupVolRight);
 			playEuphonyTrack(_eupCurrentSound, ptr);
 		}