[Scummvm-git-logs] scummvm master -> 0ea31f0e25be31590fc888bd79b42d05fd35840d

[dwatteau]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
0ea31f0e25 SCUMM: Unbreak (at least) the Steam/Windows release of Loom


Commit: 0ea31f0e25be31590fc888bd79b42d05fd35840d
    https://github.com/scummvm/scummvm/commit/0ea31f0e25be31590fc888bd79b42d05fd35840d
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-04-25T14:57:29+02:00

Commit Message:
SCUMM: Unbreak (at least) the Steam/Windows release of Loom

Fixes triggering a startSound() assert in player_ad.cpp.

When fixing a regression with the macOS Steam releases, it was decided
to also reset the game MIDI options in ScummEngine::init(), but the
chosen values are incorrect for loom-steam-win.

Just rely on the ScummMetaEngine::createInstance() fix, instead, that
should be enough.

Bug introduced in commit 2193b80119678b6067d9ed8e3f6a22a077f22ca2.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 5248bd44ab1..614d3e0c6c9 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1219,10 +1219,8 @@ Common::Error ScummEngine::init() {
 	// Steam Win and Mac versions share the same DOS data files. We show Windows or Mac
 	// for the platform the detector, but internally we force the platform to DOS, so that
 	// the code for handling the original DOS data files is used.
-	if (_filenamePattern.genMethod == kGenDiskNumSteam || _filenamePattern.genMethod == kGenRoomNumSteam) {
+	if (_filenamePattern.genMethod == kGenDiskNumSteam || _filenamePattern.genMethod == kGenRoomNumSteam)
 		_game.platform = Common::kPlatformDOS;
-		_game.midi = MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB;
-	}
 
 	// Load CJK font, if present
 	// Load it earlier so _useCJKMode variable could be set