[Scummvm-git-logs] scummvm master -> bc9e394911edad602ad2d07857f4425258e779d7

[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:
bc9e394911 SCUMM: (MI1/Mac) - re-enable new player


Commit: bc9e394911edad602ad2d07857f4425258e779d7
    https://github.com/scummvm/scummvm/commit/bc9e394911edad602ad2d07857f4425258e779d7
Author: athrxx (athrxx at scummvm.org)
Date: 2024-03-07T22:37:03+01:00

Commit Message:
SCUMM: (MI1/Mac) - re-enable new player

(forgot to remove some lines in last commit)

Changed paths:
    engines/scumm/players/player_v5m.cpp
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/players/player_v5m.cpp b/engines/scumm/players/player_v5m.cpp
index cba59227780..3126984e92e 100644
--- a/engines/scumm/players/player_v5m.cpp
+++ b/engines/scumm/players/player_v5m.cpp
@@ -83,7 +83,7 @@ namespace Scumm {
 Player_V5M::Player_V5M(ScummEngine *scumm, Audio::Mixer *mixer)
 	: Player_Mac(scumm, mixer, 3, 0x07, false) {
 	assert(_vm->_game.id == GID_MONKEY);
-	//_lastVersionBeforeSaveFormatChange = VER(114);
+	_lastVersionBeforeSaveFormatChange = VER(114);
 }
 
 bool Player_V5M::loadMusic(const byte *ptr) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index b529b699ebe..d61d975d95a 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2167,7 +2167,7 @@ void ScummEngine::setupMusic(int midi, const Common::Path &macInstrumentFile) {
 	} else if (_game.platform == Common::kPlatformAmiga && _game.version <= 4) {
 		_musicEngine = new Player_V4A(this, _mixer);
 	} else if (_game.platform == Common::kPlatformMacintosh && (_game.id == GID_INDY3 || _game.id == GID_LOOM || _game.id == GID_MONKEY)) {
-#if 1
+#if 0
 		if (_game.id == GID_LOOM) {
 			_musicEngine = new Player_V3M(this, _mixer, ConfMan.getBool("mac_v3_low_quality_music"));
 			((Player_V3M *)_musicEngine)->init(macInstrumentFile);