[Scummvm-git-logs] scummvm master -> 133c189e53fd09833cda4104ca8fd195316d3dcf

[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:
133c189e53 MM: MM1: Further MM1 startup fix


Commit: 133c189e53fd09833cda4104ca8fd195316d3dcf
    https://github.com/scummvm/scummvm/commit/133c189e53fd09833cda4104ca8fd195316d3dcf
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-05-02T18:30:56-07:00

Commit Message:
MM: MM1: Further MM1 startup fix

Changed paths:
    engines/mm/shared/xeen/sound.cpp


diff --git a/engines/mm/shared/xeen/sound.cpp b/engines/mm/shared/xeen/sound.cpp
index cff544b633a..82793b949cd 100644
--- a/engines/mm/shared/xeen/sound.cpp
+++ b/engines/mm/shared/xeen/sound.cpp
@@ -27,6 +27,9 @@
 #include "mm/shared/xeen/sound_driver_mt32.h"
 #include "mm/xeen/xeen.h"
 #include "mm/mm.h"
+#ifdef ENABLE_MM1
+#include "mm/mm1/mm1.h"
+#endif
 
 namespace MM {
 namespace Shared {
@@ -50,7 +53,11 @@ _musicVolume(0), _sfxVolume(0) {
 		break;
 	}
 
-	if (g_engine->getGameID() != GType_MightAndMagic1)
+	if (g_engine->getGameID() != GType_MightAndMagic1
+#ifdef ENABLE_MM1
+		|| static_cast<MM::MM1::MM1Engine *>(g_engine)->isEnhanced()
+#endif
+		)
 		// Force load effects early so custom instruments for mt32 are loaded before sound is played.
 		loadEffectsData();