[Scummvm-git-logs] scummvm master -> 5c6a71cc6b90ade753e348bd0a46c8dd0d34b5f7

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
4de7e9c776 PRIVATE: Do not stop sound effect when playing music
5c6a71cc6b PRIVATE: Do not stop sounds when changing to mode 1


Commit: 4de7e9c776f8fdf1bcaf4c3e486f7a322e9403d7
    https://github.com/scummvm/scummvm/commit/4de7e9c776f8fdf1bcaf4c3e486f7a322e9403d7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-11-03T07:55:15+01:00

Commit Message:
PRIVATE: Do not stop sound effect when playing music

Fixes Marlowe speech not playing when arriving at areas he has broken
in to. Game scripts play the speech sound effect first and then set
the background music with LoopedSound().

Changed paths:
    engines/private/funcs.cpp


diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index d5271c433ea..f9a15d91761 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -540,7 +540,7 @@ static void fLoopedSound(ArgArray args) {
 	Common::String s(args[0].u.str);
 
 	if (s != "\"\"") {
-		g_private->playSound(s, 0, true, true);
+		g_private->playSound(s, 0, false, true);
 	} else {
 		g_private->stopSound(true);
 	}


Commit: 5c6a71cc6b90ade753e348bd0a46c8dd0d34b5f7
    https://github.com/scummvm/scummvm/commit/5c6a71cc6b90ade753e348bd0a46c8dd0d34b5f7
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-11-03T07:55:15+01:00

Commit Message:
PRIVATE: Do not stop sounds when changing to mode 1

Fixes Marlowe speech not playing when automatically returning to his
office after the first visit to Van Nuys Hotel. Game scripts explicitly
stop sounds before changing to mode 1 when that is required.

Changed paths:
    engines/private/funcs.cpp


diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index f9a15d91761..7df609694bd 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -56,11 +56,13 @@ static void fChgMode(ArgArray args) {
 		setSymbol(location, true);
 	}
 
-	// This is the only place where this should be used
-	if (g_private->_noStopSounds) {
-		g_private->_noStopSounds = false;
-	} else {
-		g_private->stopSound(true);
+	if (g_private->_mode == 0) {
+		// This is the only place where this should be used
+		if (g_private->_noStopSounds) {
+			g_private->_noStopSounds = false;
+		} else {
+			g_private->stopSound(true);
+		}
 	}
 }