[Scummvm-git-logs] scummvm master -> 8ef151e30843cbde1b24915874829f52864901b1

[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:
8ef151e308 SCUMM: HE: Use MKTAG() in MacResExtractor for consistency


Commit: 8ef151e30843cbde1b24915874829f52864901b1
    https://github.com/scummvm/scummvm/commit/8ef151e30843cbde1b24915874829f52864901b1
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-01-10T13:14:27+01:00

Commit Message:
SCUMM: HE: Use MKTAG() in MacResExtractor for consistency

(Also fix a bit of HEMixer indent while there.)

Changed paths:
    engines/scumm/he/mixer_he.cpp
    engines/scumm/he/resource_he.cpp


diff --git a/engines/scumm/he/mixer_he.cpp b/engines/scumm/he/mixer_he.cpp
index a5dadf7d9c4..caaa8598b82 100644
--- a/engines/scumm/he/mixer_he.cpp
+++ b/engines/scumm/he/mixer_he.cpp
@@ -588,7 +588,7 @@ bool HEMixer::mixerStartChannel(
 		// data over, instead of using the original buffer.
 		if (!(_mixerChannels[channel].flags & CHANNEL_LOOPING)) {
 			const int rampUpSampleCount = !is3DOMusic ? 64 : 128;
-            int samplesSize = _mixerChannels[channel].sampleLen;
+			int samplesSize = _mixerChannels[channel].sampleLen;
 
 			data = (byte *)malloc(samplesSize);
 
@@ -608,7 +608,7 @@ bool HEMixer::mixerStartChannel(
 			// Fade-in to avoid possible sound popping...
 			byte *dataTmp = data;
 
-            // Do the fade-in only if there's enough samples to do so...
+			// Do the fade-in only if there's enough samples to do so...
 			if (!is3DOMusic && samplesSize >= rampUpSampleCount) {
 				for (int i = 0; i < rampUpSampleCount; i++) {
 					*dataTmp = 128 + (((*dataTmp - 128) * i) / rampUpSampleCount);
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 1b46594d1cb..a820b18cc83 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -33,6 +33,7 @@
 #include "graphics/wincursor.h"
 
 #include "common/archive.h"
+#include "common/endian.h"
 #include "common/memstream.h"
 #include "common/system.h"
 #include "common/formats/winexe_pe.h"
@@ -175,7 +176,7 @@ bool MacResExtractor::extractResource(int id, CachedCursor *cc) {
 			error("Cannot open file %s", _fileName.toString(Common::Path::kNativeSeparator).c_str());
 	}
 
-	Common::SeekableReadStream *dataStream = _resMgr->getResource('crsr', id + 1000);
+	Common::SeekableReadStream *dataStream = _resMgr->getResource(MKTAG('c','r','s','r'), id + 1000);
 
 	if (!dataStream)
 		return false;