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 /graphics/sjis.cpp | |
| 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 'graphics/sjis.cpp')
| -rw-r--r-- | graphics/sjis.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp index bb9f33aa26..c581f9b265 100644 --- a/graphics/sjis.cpp +++ b/graphics/sjis.cpp @@ -362,7 +362,7 @@ bool FontSjisSVM::loadData() { uint32 magic1 = data->readUint32BE(); uint32 magic2 = data->readUint32BE(); - if (magic1 != MKID_BE('SCVM') || magic2 != MKID_BE('SJIS')) { + if (magic1 != MKTAG('S','C','V','M') || magic2 != MKTAG('S','J','I','S')) { delete data; return false; } |