[Scummvm-git-logs] scummvm master -> cabcb67b61fb0d930c5aed97e9e8701a48314eab
dwatteau
noreply at scummvm.org
Sat Jan 10 11:39:04 UTC 2026
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:
cabcb67b61 SCUMM: (IMS/Mac) - Use MKTAG16() macro for consistency
Commit: cabcb67b61fb0d930c5aed97e9e8701a48314eab
https://github.com/scummvm/scummvm/commit/cabcb67b61fb0d930c5aed97e9e8701a48314eab
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2026-01-10T12:36:32+01:00
Commit Message:
SCUMM: (IMS/Mac) - Use MKTAG16() macro for consistency
Changed paths:
engines/scumm/players/player_mac_loom_monkey.cpp
diff --git a/engines/scumm/players/player_mac_loom_monkey.cpp b/engines/scumm/players/player_mac_loom_monkey.cpp
index e46bc477305..fed402c296a 100644
--- a/engines/scumm/players/player_mac_loom_monkey.cpp
+++ b/engines/scumm/players/player_mac_loom_monkey.cpp
@@ -26,6 +26,7 @@
#include "audio/audiostream.h"
#include "audio/mixer.h"
+#include "common/endian.h"
#include "common/punycode.h"
#include "common/macresman.h"
#include "common/memstream.h"
@@ -35,7 +36,7 @@ namespace Scumm {
#define ASC_DEVICE_RATE 0x56EE8BA3
#define PCM_BUFFER_SIZE 1024
-class MacSndLoader{
+class MacSndLoader {
protected:
MacSndLoader(bool useInstrTag);
public:
@@ -203,7 +204,7 @@ bool LoomMacSndLoader::init() {
}
bool LoomMacSndLoader::checkResource(const byte *data, uint32 dataSize) const {
- return (dataSize >= 14 && READ_BE_UINT16(data + 4) == 'so' && !READ_BE_UINT32(data + 10));
+ return (dataSize >= 14 && READ_BE_UINT16(data + 4) == MKTAG16('s','o') && !READ_BE_UINT32(data + 10));
}
bool LoomMacSndLoader::loadSound(const byte *data, uint32 dataSize) {
More information about the Scummvm-git-logs
mailing list