[Scummvm-git-logs] scummvm master -> 06a5114294fc6d2e33ccb5e97cb96f17a522dfa5

[athrxx]

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:
06a5114294 SCUMM: (LOOM/MAC) - sync launcher and menu settings for music quality


Commit: 06a5114294fc6d2e33ccb5e97cb96f17a522dfa5
    https://github.com/scummvm/scummvm/commit/06a5114294fc6d2e33ccb5e97cb96f17a522dfa5
Author: athrxx (athrxx at scummvm.org)
Date: 2024-02-10T14:51:42+01:00

Commit Message:
SCUMM: (LOOM/MAC) - sync launcher and menu settings for music quality

The Mac menu will now have the setting from the launcher and vice versa.

Changed paths:
    engines/scumm/macgui/macgui_loom.cpp
    engines/scumm/vars.cpp


diff --git a/engines/scumm/macgui/macgui_loom.cpp b/engines/scumm/macgui/macgui_loom.cpp
index 1c92ce0e793..08cba46e696 100644
--- a/engines/scumm/macgui/macgui_loom.cpp
+++ b/engines/scumm/macgui/macgui_loom.cpp
@@ -636,7 +636,7 @@ bool MacLoomGui::runOptionsDialog() {
 	int scrolling = _vm->_snapScroll == 0;
 	int fullAnimation = _vm->VAR(_vm->VAR_MACHINE_SPEED) == 1 ? 0 : 1;
 	int textSpeed = _vm->_defaultTextSpeed;
-	int musicQuality = _vm->VAR(_vm->VAR_SOUNDCARD) == 10 ? 0 : 2;
+	int musicQuality = (ConfMan.hasKey("mac_v3_low_quality_music") && ConfMan.getBool("mac_v3_low_quality_music")) ? 0 : (_vm->VAR(_vm->VAR_SOUNDCARD) == 10 ? 0 : 2);
 
 	MacDialogWindow *window = createDialog(1000);
 
@@ -725,10 +725,10 @@ bool MacLoomGui::runOptionsDialog() {
 		// value for VAR_SOUNDCARD...
 		_vm->VAR(_vm->VAR_SOUNDCARD) = window->getWidgetValue(12) == 0 ? 10 : 11;
 		((Player_V3M *)_vm->_musicEngine)->overrideQuality(_vm->VAR(_vm->VAR_SOUNDCARD) == 10);
+		ConfMan.setBool("mac_v3_low_quality_music", _vm->VAR(_vm->VAR_SOUNDCARD) == 10);
 
 		debug(6, "MacLoomGui::runOptionsDialog(): music quality: %d - unimplemented!", window->getWidgetValue(12));
 
-
 		_vm->syncSoundSettings();
 		ConfMan.flushToDisk();
 	}
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 4c3fe5e4ca3..65bba51185c 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -858,7 +858,7 @@ void ScummEngine::setSoundCardVarToCurrentConfig() {
 	// 4 Roland
 	switch (_sound->_musicType) {
 	case MDT_MACINTOSH:
-		if (_game.id == GID_INDY3)
+		if (_game.id == GID_INDY3 || _game.id == GID_LOOM)
 			VAR(VAR_SOUNDCARD) = (ConfMan.hasKey("mac_v3_low_quality_music") && ConfMan.getBool("mac_v3_low_quality_music")) ? 10 : 11;
 		else
 			VAR(VAR_SOUNDCARD) = 3;