[Scummvm-git-logs] scummvm master -> 2614f0d245c9c38dc04680f1da1a72547f474b33

[bluegr]

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:
2614f0d245 DREAMWEB: lower the music volume in the last scene


Commit: 2614f0d245c9c38dc04680f1da1a72547f474b33
    https://github.com/scummvm/scummvm/commit/2614f0d245c9c38dc04680f1da1a72547f474b33
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-10-27T02:45:57+03:00

Commit Message:
DREAMWEB: lower the music volume in the last scene

Changed paths:
    engines/dreamweb/stubs.cpp


diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0ef172b0b6d..7fde37ccd59 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -41,7 +41,7 @@ const Room g_roomData[] = {
 	  255,255,255,0,
 	  7,2,255,255,255,255,6,255,255,255,1 },
 
-	// location 2: Louis' (?)
+	// location 2: Louis'
 	{ "DREAMWEB.R02",
 	  2,255,33,0,
 	  255,255,255,0,
@@ -113,7 +113,7 @@ const Room g_roomData[] = {
 	  255,255,255,0,
 	  1,4,255,255,255,255,255,255,255,255,13 },
 
-	// location 14
+	// location 14: subway station
 	{ "DREAMWEB.R14",
 	  14,255,44,20,
 	  255,255,255,0,
@@ -2227,20 +2227,27 @@ void DreamWebEngine::atmospheres() {
 			_sound->playChannel0(a->_sound, a->_repeat);
 
 			// NB: The asm here reads
-			//	cmp reallocation,2
+			//  cmp reallocation,2
 			//  cmp mapy,0
 			//  jz fullvol
 			//  jnz notlouisvol
-			//  I'm interpreting this as if the cmp reallocation is below the jz
+			// This should probably be interpreted like this:
+			//  cmp reallocation,2
+			//  jnz notlouisvol
+			//  cmp mapy,0
+			//  jz  fullvol
+			if (_realLocation == 2) {
+				if (_mapY == 0) {
+					_sound->volumeSet(0); // "fullvol"
+					return;
+				}
 
-			if (_mapY == 0) {
-				_sound->volumeSet(0); // "fullvol"
-				return;
+				if (_mapX == 22 && _mapY == 10) {
+					_sound->volumeSet(5); // "louisvol"
+					return;
+				}
 			}
 
-			if (_realLocation == 2 && _mapX == 22 && _mapY == 10)
-				_sound->volumeSet(5); // "louisvol"
-
 			if (hasSpeech() && _realLocation == 14) {
 				if (_mapX == 33) {
 					_sound->volumeSet(0); // "ismad2"