diff options
Diffstat (limited to 'engines/saga')
-rw-r--r-- | engines/saga/detection.cpp | 2 | ||||
-rw-r--r-- | engines/saga/resource_hrs.cpp | 2 | ||||
-rw-r--r-- | engines/saga/resource_rsc.cpp | 2 | ||||
-rw-r--r-- | engines/saga/saveload.cpp | 6 | ||||
-rw-r--r-- | engines/saga/script.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp index f8c06bff8c..b1bcc99295 100644 --- a/engines/saga/detection.cpp +++ b/engines/saga/detection.cpp @@ -264,7 +264,7 @@ SaveStateDescriptor SagaMetaEngine::querySaveMetaInfos(const char *target, int s if (version < 4) warning("This savegame is not endian-safe. There may be problems"); - if (type != MKID_BE('SAGA')) { + if (type != MKTAG('S','A','G','A')) { error("SagaEngine::load wrong save game format"); } diff --git a/engines/saga/resource_hrs.cpp b/engines/saga/resource_hrs.cpp index 2ec2099c8d..21cf0ef4c1 100644 --- a/engines/saga/resource_hrs.cpp +++ b/engines/saga/resource_hrs.cpp @@ -62,7 +62,7 @@ bool ResourceContext_HRS::loadResV2(uint32 contextSize) { readElement(_file, origin); // Check if the file is valid - if (origin.id != MKID_BE('HRES')) { // header + if (origin.id != MKTAG('H','R','E','S')) { // header return false; } diff --git a/engines/saga/resource_rsc.cpp b/engines/saga/resource_rsc.cpp index 42c4dc05e8..089757ca27 100644 --- a/engines/saga/resource_rsc.cpp +++ b/engines/saga/resource_rsc.cpp @@ -30,7 +30,7 @@ namespace Saga { -#define ID_MIDI MKID_BE('Midi') +#define ID_MIDI MKTAG('M','i','d','i') bool ResourceContext_RSC::loadMacMIDI() { // Sanity check diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index c5388d6878..9edb79fa7c 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -151,7 +151,7 @@ void SagaEngine::fillSaveList() { _saveHeader.version = in->readUint32LE(); in->read(_saveHeader.name, sizeof(_saveHeader.name)); - if (_saveHeader.type != MKID_BE('SAGA')) { + if (_saveHeader.type != MKTAG('S','A','G','A')) { warning("SagaEngine::load wrong save %s format", name); i++; continue; @@ -175,7 +175,7 @@ void SagaEngine::save(const char *fileName, const char *saveName) { return; } - _saveHeader.type = MKID_BE('SAGA'); + _saveHeader.type = MKTAG('S','A','G','A'); _saveHeader.size = 0; _saveHeader.version = CURRENT_SAGA_VER; // Note that IHNM has a smaller save title size than ITE @@ -287,7 +287,7 @@ void SagaEngine::load(const char *fileName) { if (_saveHeader.version < 4) warning("This savegame is not endian-safe. There may be problems"); - if (_saveHeader.type != MKID_BE('SAGA')) { + if (_saveHeader.type != MKTAG('S','A','G','A')) { error("SagaEngine::load wrong save game format"); } diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 3ae2f19e1b..bd1d6e5d84 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -160,7 +160,7 @@ SAGA2Script::SAGA2Script(SagaEngine *vm) : Script(vm) { } // Script export segment (lookup table) - uint32 saga2ExportSegId = MKID_BE('_EXP'); + uint32 saga2ExportSegId = MKTAG('_','E','X','P'); int32 entryNum = _scriptContext->getEntryNum(saga2ExportSegId); if (entryNum < 0) error("Unable to locate the script's export segment"); @@ -176,7 +176,7 @@ SAGA2Script::SAGA2Script(SagaEngine *vm) : Script(vm) { // Script data segment /* - uint32 saga2DataSegId = MKID_BE('__DA'); + uint32 saga2DataSegId = MKTAG('_','_','D','A'); entryNum = _scriptContext->getEntryNum(saga2DataSegId); if (entryNum < 0) error("Unable to locate the script's data segment"); |