aboutsummaryrefslogtreecommitdiff
path: root/engines/made/database.cpp
diff options
context:
space:
mode:
authorMax Horn2011-04-12 16:53:15 +0200
committerMax Horn2011-04-12 16:53:15 +0200
commit0ce2ca4e006a70d787481040fa844c85aac43222 (patch)
tree25fb61d7e7165ec2570ecf14a4af52e9bdb6b176 /engines/made/database.cpp
parenta8b3501252c46c3fc4fd129fa0a945eb87f47d0a (diff)
downloadscummvm-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/made/database.cpp')
-rw-r--r--engines/made/database.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index 2aa378edf5..8d06aa0085 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -659,7 +659,7 @@ bool GameDatabaseV3::getSavegameDescription(const char *filename, Common::String
}
uint32 header = in->readUint32BE();
- if (header != MKID_BE('SGAM')) {
+ if (header != MKTAG('S','G','A','M')) {
warning("Save game header missing");
delete in;
return false;
@@ -696,7 +696,7 @@ int16 GameDatabaseV3::savegame(const char *filename, const char *description, in
return 6;
}
strncpy(desc, description, 64);
- out->writeUint32BE(MKID_BE('SGAM'));
+ out->writeUint32BE(MKTAG('S','G','A','M'));
out->writeUint32LE(size);
out->writeUint16LE(version);
out->write(desc, 64);
@@ -715,7 +715,7 @@ int16 GameDatabaseV3::loadgame(const char *filename, int16 version) {
}
uint32 header = in->readUint32BE();
- if (header != MKID_BE('SGAM')) {
+ if (header != MKTAG('S','G','A','M')) {
warning("Save game header missing");
delete in;
return 1;