[Scummvm-git-logs] scummvm master -> 169a6aa08b534559a415abffc8e359036135b593

[dreammaster]

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

Summary:
86b0b2a27d M4: RIDDLE: Fix crash in room 203
169a6aa08b M4: RIDDLE: Respect the volume in digi play calls


Commit: 86b0b2a27d9e55a56c3420825814b0706829e605
    https://github.com/scummvm/scummvm/commit/86b0b2a27d9e55a56c3420825814b0706829e605
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-03T22:23:46-08:00

Commit Message:
M4: RIDDLE: Fix crash in room 203

Changed paths:
    engines/m4/riddle/rooms/section2/room203.cpp


diff --git a/engines/m4/riddle/rooms/section2/room203.cpp b/engines/m4/riddle/rooms/section2/room203.cpp
index d8504be1f9b..2e4c5041ca6 100644
--- a/engines/m4/riddle/rooms/section2/room203.cpp
+++ b/engines/m4/riddle/rooms/section2/room203.cpp
@@ -2571,7 +2571,8 @@ void Room203::daemon() {
 		break;
 
 	default:
-		error("Unhandled trigger");
+		if (_G(kernel).trigger < 9999)
+			error("Unhandled trigger");
 		break;
 	}
 }


Commit: 169a6aa08b534559a415abffc8e359036135b593
    https://github.com/scummvm/scummvm/commit/169a6aa08b534559a415abffc8e359036135b593
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-11-03T22:28:55-08:00

Commit Message:
M4: RIDDLE: Respect the volume in digi play calls

Changed paths:
    engines/m4/platform/sound/digi.cpp


diff --git a/engines/m4/platform/sound/digi.cpp b/engines/m4/platform/sound/digi.cpp
index ae0a2491007..05b446c08e0 100644
--- a/engines/m4/platform/sound/digi.cpp
+++ b/engines/m4/platform/sound/digi.cpp
@@ -129,7 +129,7 @@ int32 Digi::play(const Common::String &name, uint channel, int32 vol, int32 trig
 				DisposeAfterUse::NO),
 			loop ? 0 : 1);
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &c._soundHandle, stream,
-		-1);
+		-1, vol);
 
 	if (trigger < 0 || trigger > 32767)
 		trigger = -1;