[Scummvm-git-logs] scummvm master -> 75868768870624820614669fc53a94d20e4f3128

[eriktorbjorn]

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:
7586876887 SCUMM: Make skipping Sam & Max sound pre-loading an enhancement


Commit: 75868768870624820614669fc53a94d20e4f3128
    https://github.com/scummvm/scummvm/commit/75868768870624820614669fc53a94d20e4f3128
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-05-06T19:51:11+02:00

Commit Message:
SCUMM: Make skipping Sam & Max sound pre-loading an enhancement

The original commit message says "Skip sound caching in Sam & Max
(Talkie)", with no mention of copy protection being involved. I guess
the _copyProtection flag was re-used as a convenient but rather
unintuitive way of preserving the original behavior.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index c5e81284617..34b2157fe9f 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1628,7 +1628,8 @@ void ScummEngine::setupScumm(const Common::String &macResourceFile) {
 		_bootParam = -7873;
 	}
 
-	if (!_copyProtection && _game.id == GID_SAMNMAX && _bootParam == 0) {
+	// Skip the sound pre-loading
+	if (_game.id == GID_SAMNMAX && _bootParam == 0 && _enableEnhancements) {
 		_bootParam = -1;
 	}