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/queen | |
| 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/queen')
| -rw-r--r-- | engines/queen/display.cpp | 6 | ||||
| -rw-r--r-- | engines/queen/queen.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/resource.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp index 7b16df52bf..b130b27a89 100644 --- a/engines/queen/display.cpp +++ b/engines/queen/display.cpp @@ -843,19 +843,19 @@ void Display::decodeLBM(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dst uint32 size = READ_BE_UINT32(src + 4); src += 8; switch (type) { - case MKID_BE('BMHD'): { + case MKTAG('B','M','H','D'): { *w = READ_BE_UINT16(src + 0); *h = READ_BE_UINT16(src + 2); planeCount = src[8]; planePitch = ((*w + 15) >> 4) * 2; } break; - case MKID_BE('CMAP'): { + case MKTAG('C','M','A','P'): { assert(palStart <= palEnd && palEnd <= size / 3); memcpy(pal, src + palStart * 3, (palEnd - palStart) * 3); } break; - case MKID_BE('BODY'): { + case MKTAG('B','O','D','Y'): { uint32 planarSize = (*h) * planeCount * planePitch; uint8 *planarBuf = new uint8[planarSize]; uint8 *dstPlanar = planarBuf; diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 692e38179a..519f028cda 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -403,7 +403,7 @@ Common::InSaveFile *QueenEngine::readGameStateHeader(int slot, GameStateHeader * char name[20]; makeGameStateName(slot, name); Common::InSaveFile *file = _saveFileMan->openForLoading(name); - if (file && file->readUint32BE() == MKID_BE('SCVM')) { + if (file && file->readUint32BE() == MKTAG('S','C','V','M')) { gsh->version = file->readUint32BE(); gsh->flags = file->readUint32BE(); gsh->dataSize = file->readUint32BE(); diff --git a/engines/queen/resource.cpp b/engines/queen/resource.cpp index a70d1f1613..e8519ee68b 100644 --- a/engines/queen/resource.cpp +++ b/engines/queen/resource.cpp @@ -132,7 +132,7 @@ void Resource::loadTextFile(const char *filename, Common::StringArray &stringLis bool Resource::detectVersion(DetectedGameVersion *ver, Common::File *f) { memset(ver, 0, sizeof(DetectedGameVersion)); - if (f->readUint32BE() == MKID_BE('QTBL')) { + if (f->readUint32BE() == MKTAG('Q','T','B','L')) { f->read(ver->str, 6); f->skip(2); ver->compression = f->readByte(); @@ -269,7 +269,7 @@ void Resource::seekResourceFile(int num, uint32 offset) { void Resource::readTableFile(uint8 version, uint32 offset) { Common::File tableFile; tableFile.open(_tableFilename); - if (tableFile.isOpen() && tableFile.readUint32BE() == MKID_BE('QTBL')) { + if (tableFile.isOpen() && tableFile.readUint32BE() == MKTAG('Q','T','B','L')) { uint32 tableVersion = tableFile.readUint32BE(); if (version > tableVersion) { error("The game you are trying to play requires version %d of queen.tbl, " |