diff options
| author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
| commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
| tree | 9173f9964c0fec4215514e622f705810730d0ce9 /engines/groovie | |
| parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
| parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
| download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
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 7195198a6c..24306c8bfd 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -706,7 +706,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 @@ -715,7 +715,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); } |