libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MM: MM1: Fix crash on startup

Browse Source
This commit is contained in:
Paul Gilbert 2024-05-01 21:55:43 -07:00
parent 42e9dde7d1
commit 9bf01106fd
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/mm/mm1/mm1.cpp
View File

@ -62,10 +62,6 @@ Common::Error MM1Engine::run() {
// Initialize graphics mode
initGraphics(320, 200);
// Setup mixer
_sound = new Sound(_mixer);
syncSoundSettings();
if (isEnhanced()) {
if (!setupEnhanced())
return Common::kNoError;
@ -73,6 +69,10 @@ Common::Error MM1Engine::run() {
setupNormal();
}
// Setup mixer
_sound = new Sound(_mixer);
syncSoundSettings();
// Setup console
setDebugger(new Console());
if (gDebugLevel > 0)

5
engines/mm/shared/xeen/sound.cpp
View File

@ -50,8 +50,9 @@ _musicVolume(0), _sfxVolume(0) {
break;
}
// force load effects early so custom instruments for mt32 are loaded before sound is played.
loadEffectsData();
if (g_engine->getGameID() != GType_MightAndMagic1)
// Force load effects early so custom instruments for mt32 are loaded before sound is played.
loadEffectsData();
assert(_SoundDriver);