[Scummvm-git-logs] scummvm master -> 7520fed5ab2d48bc49751bb1a5e82491a6dea1d6

AndywinXp noreply at scummvm.org
Mon Sep 2 21:10:55 UTC 2024


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:
7520fed5ab SCUMM: MAC: Improve inconsistent sound card state detection


Commit: 7520fed5ab2d48bc49751bb1a5e82491a6dea1d6
    https://github.com/scummvm/scummvm/commit/7520fed5ab2d48bc49751bb1a5e82491a6dea1d6
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-09-02T23:10:47+02:00

Commit Message:
SCUMM: MAC: Improve inconsistent sound card state detection

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 8bd356e2f38..f92f8ea6942 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1967,7 +1967,10 @@ void ScummEngine::saveLoadWithSerializer(Common::Serializer &s) {
 
 	if (s.isLoading() && VAR_SOUNDCARD != 0xFF && (_game.heversion < 70 && _game.version <= 6)) {
 		if (currentSoundCard != VAR(VAR_SOUNDCARD) && !isMonkey1MacDefaultSoundCardValue) {
-			Common::String soundCards[] = {"PC Speaker", "IBM PCjr/Tandy", "Creative Music System", "AdLib", "Roland MT-32/CM-32L"};
+			Common::String soundCards[] = {
+				"PC Speaker", "IBM PCjr/Tandy", "Creative Music System", "AdLib", "Roland MT-32/CM-32L"
+				"", "", "", "", "", "", "Macintosh Low Quality Sound", "Macintosh High Quality Sound"
+			};
 			
 			GUI::MessageDialog dialog(
 				Common::U32String::format(_("Warning: incompatible sound settings detected between the current configuration and this saved game.\n\n"




More information about the Scummvm-git-logs mailing list