[Scummvm-git-logs] scummvm master -> 9c910b9000f1c943f745a9479434bd7e0c0bb11d

[sev-]

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:
9c910b9000 TUCKER: Fix dentist music in mall being played incorrectly


Commit: 9c910b9000f1c943f745a9479434bd7e0c0bb11d
    https://github.com/scummvm/scummvm/commit/9c910b9000f1c943f745a9479434bd7e0c0bb11d
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-01-31T19:17:35+01:00

Commit Message:
TUCKER: Fix dentist music in mall being played incorrectly

Changed paths:
    engines/tucker/locations.cpp


diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 5131b85..0c31b98 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -711,12 +711,12 @@ void TuckerEngine::execData3PreUpdate_locationNum9() {
 	if (_flagsTable[7] < 2) {
 		_flagsTable[7] = 2;
 	}
-	if (_flagsTable[8] == 0 && _locationMusicsTable[0]._volume != 0) {
-		_locationMusicsTable[0]._volume = 0;
-	} else {
-		_locationMusicsTable[0]._volume = _xPosCurrent / 40;
-	}
+
+	// If the door to the dentist is open play the dentist room music based on
+	// Bud's proximity to the door (the closer the louder the music is played)
+	_locationMusicsTable[0]._volume = _flagsTable[8] == 0 ? 0 : _xPosCurrent / 40;
 	setVolumeMusic(0, _locationMusicsTable[0]._volume);
+
 	if (!isSoundPlaying(1) && getRandomNumber() > 32000) {
 		int i = getRandomNumber() / 5500 + 3;
 		assert(i >= 0 && i < kLocationSoundsTableSize);