diff options
| -rw-r--r-- | engines/queen/queen.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_bndmgr.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/insane/insane.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index 134f24fe29..7877b60a5a 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -291,7 +291,7 @@ Common::InSaveFile *QueenEngine::readGameStateHeader(uint16 slot, GameStateHeade char name[20]; makeGameStateName(slot, name); Common::InSaveFile *file = _saveFileMan->openForLoading(name); - if (file && file->readUint32BE() == 'SCVM') { + if (file && file->readUint32BE() == MKID_BE('SCVM')) { gsh->version = file->readUint32BE(); gsh->flags = file->readUint32BE(); gsh->dataSize = file->readUint32BE(); diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp index 64c533554c..671a71ac09 100644 --- a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp @@ -89,7 +89,7 @@ int BundleDirCache::matchFile(const char *filename) { error("BundleDirCache::matchFileFile() Can't find free slot for file bundle dir cache"); tag = file.readUint32BE(); - if (tag == 'LB23') + if (tag == MKID_BE('LB23')) _budleDirCache[freeSlot].compressedBun = true; offset = file.readUint32BE(); @@ -109,7 +109,7 @@ int BundleDirCache::matchFile(const char *filename) { int32 z = 0; int32 z2; - if (tag == 'LB23') { + if (tag == MKID_BE('LB23')) { file.read(_budleDirCache[freeSlot].bundleTable[i].filename, 24); } else { for (z2 = 0; z2 < 8; z2++) diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 733b0d576c..2b88f37b17 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -90,7 +90,7 @@ void ImuseDigiSndMgr::prepareSoundFromRMAP(Common::File *file, soundStruct *soun file->seek(offset, SEEK_SET); uint32 tag = file->readUint32BE(); - assert(tag == 'RMAP'); + assert(tag == MKID_BE('RMAP')); int32 version = file->readUint32BE(); if (version != 2) { error("ImuseDigiSndMgr::prepareSoundFromRMAP: Wrong version number, expected 2, but it's: %d.", version); diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp index 6209a96c0a..15c653dc98 100644 --- a/engines/scumm/insane/insane.cpp +++ b/engines/scumm/insane/insane.cpp @@ -1422,7 +1422,7 @@ int32 Insane::smush_setupSanWithFlu(const char *filename, int32 setupsan2, int32 _smush_setupsan1 = setupsan1; /* skip FLUP marker */ - if (READ_BE_UINT32(fluPtr) == 'FLUP') + if (READ_BE_UINT32(fluPtr) == MKID_BE('FLUP')) tmp += 8; _smush_setupsan2 = setupsan2; |