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

[dreammaster]

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:
5e529c0d36 M4: Fix optional allowing sound to keep playing between rooms


Commit: 5e529c0d3628dcdf4520b287bab74389d0617da5
    https://github.com/scummvm/scummvm/commit/5e529c0d3628dcdf4520b287bab74389d0617da5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-02-11T16:44:39-08:00

Commit Message:
M4: Fix optional allowing sound to keep playing between rooms

Changed paths:
    engines/m4/core/rooms.cpp
    engines/m4/core/rooms.h


diff --git a/engines/m4/core/rooms.cpp b/engines/m4/core/rooms.cpp
index f0b5d9b8496..57259187880 100644
--- a/engines/m4/core/rooms.cpp
+++ b/engines/m4/core/rooms.cpp
@@ -90,7 +90,7 @@ void Sections::m4SceneLoad() {
 	_cameraShift_vert_Amount = 0;
 	_G(art_base_override) = nullptr;
 	_G(use_alternate_attribute_file) = true;
-	shut_down_digi_tracks_between_rooms = true;
+	_G(shut_down_digi_tracks_between_rooms) = true;
 	camera_pan_step = 10;
 	_G(camera_reacts_to_player) = true;
 
@@ -204,7 +204,7 @@ void Sections::m4EndScene() {
 
 	pal_cycle_stop();
 
-	if (shut_down_digi_tracks_between_rooms) {
+	if (_G(shut_down_digi_tracks_between_rooms)) {
 		_G(digi).stop(1);
 		_G(digi).stop(2);
 		_G(digi).stop(3);
diff --git a/engines/m4/core/rooms.h b/engines/m4/core/rooms.h
index 20b1216ffa9..7922ac3e851 100644
--- a/engines/m4/core/rooms.h
+++ b/engines/m4/core/rooms.h
@@ -87,7 +87,6 @@ class Sections {
 private:
 	int32 _cameraShiftAmount = 0;
 	int32 _cameraShift_vert_Amount = 0;
-	bool shut_down_digi_tracks_between_rooms = true;
 	int32 camera_pan_step = 10;
 
 	void get_ipl();