diff options
Diffstat (limited to 'engines/toon')
| -rw-r--r-- | engines/toon/script.cpp | 6 | ||||
| -rw-r--r-- | engines/toon/script.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/toon/script.cpp b/engines/toon/script.cpp index 376b1db621..0242ace7e3 100644 --- a/engines/toon/script.cpp +++ b/engines/toon/script.cpp @@ -70,7 +70,7 @@ EMCInterpreter::~EMCInterpreter() { bool EMCInterpreter::callback(Common::IFFChunk &chunk) { switch (chunk._type) { - case MKID_BE('TEXT'): + case MKTAG('T','E','X','T'): delete[] _scriptData->text; _scriptData->text = new byte[chunk._size]; assert(_scriptData->text); @@ -78,7 +78,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) { error("Couldn't read TEXT chunk from file '%s'", _filename); break; - case MKID_BE('ORDR'): + case MKTAG('O','R','D','R'): delete[] _scriptData->ordr; _scriptData->ordr = new uint16[chunk._size >> 1]; assert(_scriptData->ordr); @@ -89,7 +89,7 @@ bool EMCInterpreter::callback(Common::IFFChunk &chunk) { _scriptData->ordr[i] = READ_BE_UINT16(&_scriptData->ordr[i]); break; - case MKID_BE('DATA'): + case MKTAG('D','A','T','A'): delete[] _scriptData->data; _scriptData->data = new uint16[chunk._size >> 1]; assert(_scriptData->data); diff --git a/engines/toon/script.h b/engines/toon/script.h index 2a74f9084f..b6d28e1171 100644 --- a/engines/toon/script.h +++ b/engines/toon/script.h @@ -87,9 +87,9 @@ public: // Both lead to some problems in our IFF parser, either reading after the end // of file or producing a "Chunk overread" error message. To work around this // we need to adjust the size field properly. - if (_formType == MKID_BE('EMC2')) + if (_formType == MKTAG('E','M','C','2')) _formChunk.size -= 8; - else if (_formType == MKID_BE('AVFS')) + else if (_formType == MKTAG('A','V','F','S')) _formChunk.size += 4; } }; |