diff options
| author | Max Horn | 2011-04-12 16:53:15 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-12 16:53:15 +0200 |
| commit | 0ce2ca4e006a70d787481040fa844c85aac43222 (patch) | |
| tree | 25fb61d7e7165ec2570ecf14a4af52e9bdb6b176 /engines/groovie | |
| parent | a8b3501252c46c3fc4fd129fa0a945eb87f47d0a (diff) | |
| download | scummvm-rg350-0ce2ca4e006a70d787481040fa844c85aac43222.tar.gz scummvm-rg350-0ce2ca4e006a70d787481040fa844c85aac43222.tar.bz2 scummvm-rg350-0ce2ca4e006a70d787481040fa844c85aac43222.zip | |
COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/cursor.cpp | 2 | ||||
| -rw-r--r-- | engines/groovie/music.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp index 6a87af8daf..db4134ccb0 100644 --- a/engines/groovie/cursor.cpp +++ b/engines/groovie/cursor.cpp @@ -404,7 +404,7 @@ GrvCursorMan_v2::GrvCursorMan_v2(OSystem *system) : // Verify the signature uint32 tmp32 = iconsFile.readUint32BE(); uint16 tmp16 = iconsFile.readUint16LE(); - if (tmp32 != MKID_BE('icon') || tmp16 != 1) + if (tmp32 != MKTAG('i','c','o','n') || tmp16 != 1) error("Groovie::Cursor: icons.ph signature failed: %s %d", tag2str(tmp32), tmp16); diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 7529f95bcf..45f9800211 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -684,7 +684,7 @@ bool MusicPlayerMac::load(uint32 fileref, bool loop) { debugC(1, kGroovieDebugMIDI | kGroovieDebugAll, "Groovie::Music: Starting the playback of song: %04X", fileref); // First try for compressed MIDI - Common::SeekableReadStream *file = _vm->_macResFork->getResource(MKID_BE('cmid'), fileref & 0x3FF); + Common::SeekableReadStream *file = _vm->_macResFork->getResource(MKTAG('c','m','i','d'), fileref & 0x3FF); if (file) { // Found the resource, decompress it @@ -693,7 +693,7 @@ bool MusicPlayerMac::load(uint32 fileref, bool loop) { file = tmp; } else { // Otherwise, it's uncompressed - file = _vm->_macResFork->getResource(MKID_BE('Midi'), fileref & 0x3FF); + file = _vm->_macResFork->getResource(MKTAG('M','i','d','i'), fileref & 0x3FF); if (!file) error("Groovie::Music: Couldn't find resource 0x%04X", fileref); } |