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.

4 files changed, 32 insertions, 32 deletions

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 5a6b1859cd..0433479a09 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -903,7 +903,7 @@ void GfxPalette::loadMacIconBarPalette() {
 	if (!g_sci->hasMacIconBar())
 		return;
 
-	Common::SeekableReadStream *clutStream = g_sci->getMacExecutable()->getResource(MKID_BE('clut'), 150);
+	Common::SeekableReadStream *clutStream = g_sci->getMacExecutable()->getResource(MKTAG('c','l','u','t'), 150);
 
 	if (!clutStream)
 		error("Could not find clut 150 for the Mac icon bar");
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 61df02acf9..4caa77b0ae 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1488,7 +1488,7 @@ void ResourceManager::readResourcePatchesBase36() {
 				Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(name);
 				uint32 tag = stream->readUint32BE();
 
-				if (tag == MKID_BE('RIFF') || tag == MKID_BE('FORM')) {
+				if (tag == MKTAG('R','I','F','F') || tag == MKTAG('F','O','R','M')) {
 					delete stream;
 					processWavePatch(resource36, name);
 					continue;
@@ -1497,7 +1497,7 @@ void ResourceManager::readResourcePatchesBase36() {
 				// Check for SOL as well
 				tag = (tag << 16) | stream->readUint16BE();
 					
-				if (tag != MKID_BE('SOL\0')) {
+				if (tag != MKTAG('S','O','L',0)) {
 					delete stream;
 					continue;
 				}
@@ -1746,25 +1746,25 @@ struct MacResTag {
 };
 
 static const MacResTag macResTagMap[] = {
-	{ MKID_BE('V56 '), kResourceTypeView },
-	{ MKID_BE('P56 '), kResourceTypePic },
-	{ MKID_BE('SCR '), kResourceTypeScript },
-	{ MKID_BE('TEX '), kResourceTypeText },
-	{ MKID_BE('SND '), kResourceTypeSound },
-	{ MKID_BE('VOC '), kResourceTypeVocab },
-	{ MKID_BE('FON '), kResourceTypeFont },
-	{ MKID_BE('CURS'), kResourceTypeCursor },
-	{ MKID_BE('crsr'), kResourceTypeCursor },
-	{ MKID_BE('Pat '), kResourceTypePatch },
-	{ MKID_BE('PAL '), kResourceTypePalette },
-	{ MKID_BE('snd '), kResourceTypeAudio },
-	{ MKID_BE('MSG '), kResourceTypeMessage },
-	{ MKID_BE('HEP '), kResourceTypeHeap },
-	{ MKID_BE('IBIN'), kResourceTypeMacIconBarPictN },
-	{ MKID_BE('IBIS'), kResourceTypeMacIconBarPictS },
-	{ MKID_BE('PICT'), kResourceTypeMacPict },
-	{ MKID_BE('SYN '), kResourceTypeSync },
-	{ MKID_BE('SYNC'), kResourceTypeSync }
+	{ MKTAG('V','5','6',' '), kResourceTypeView },
+	{ MKTAG('P','5','6',' '), kResourceTypePic },
+	{ MKTAG('S','C','R',' '), kResourceTypeScript },
+	{ MKTAG('T','E','X',' '), kResourceTypeText },
+	{ MKTAG('S','N','D',' '), kResourceTypeSound },
+	{ MKTAG('V','O','C',' '), kResourceTypeVocab },
+	{ MKTAG('F','O','N',' '), kResourceTypeFont },
+	{ MKTAG('C','U','R','S'), kResourceTypeCursor },
+	{ MKTAG('c','r','s','r'), kResourceTypeCursor },
+	{ MKTAG('P','a','t',' '), kResourceTypePatch },
+	{ MKTAG('P','A','L',' '), kResourceTypePalette },
+	{ MKTAG('s','n','d',' '), kResourceTypeAudio },
+	{ MKTAG('M','S','G',' '), kResourceTypeMessage },
+	{ MKTAG('H','E','P',' '), kResourceTypeHeap },
+	{ MKTAG('I','B','I','N'), kResourceTypeMacIconBarPictN },
+	{ MKTAG('I','B','I','S'), kResourceTypeMacIconBarPictS },
+	{ MKTAG('P','I','C','T'), kResourceTypeMacPict },
+	{ MKTAG('S','Y','N',' '), kResourceTypeSync },
+	{ MKTAG('S','Y','N','C'), kResourceTypeSync }
 };
 
 static Common::Array<uint32> resTypeToMacTags(ResourceType type) {
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 386bfb37f5..6e74553f56 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -53,9 +53,9 @@ AudioVolumeResourceSource::AudioVolumeResourceSource(ResourceManager *resMan, co
 	fileStream->seek(0, SEEK_SET);
 	uint32 compressionType = fileStream->readUint32BE();
 	switch (compressionType) {
-	case MKID_BE('MP3 '):
-	case MKID_BE('OGG '):
-	case MKID_BE('FLAC'):
+	case MKTAG('M','P','3',' '):
+	case MKTAG('O','G','G',' '):
+	case MKTAG('F','L','A','C'):
 		// Detected a compressed audio volume
 		_audioCompressionType = compressionType;
 		// Now read the whole offset mapping table for later usage
@@ -91,7 +91,7 @@ bool Resource::loadFromWaveFile(Common::SeekableReadStream *file) {
 bool Resource::loadFromAudioVolumeSCI11(Common::SeekableReadStream *file) {
 	// Check for WAVE files here
 	uint32 riffTag = file->readUint32BE();
-	if (riffTag == MKID_BE('RIFF')) {
+	if (riffTag == MKTAG('R','I','F','F')) {
 		_headerSize = 0;
 		size = file->readUint32LE() + 8;
 		file->seek(-8, SEEK_CUR);
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 73f471b247..53311b4252 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -195,7 +195,7 @@ static bool readSOLHeader(Common::SeekableReadStream *audioStream, int headerSiz
 
 	uint32 tag = audioStream->readUint32BE();
 
-	if (tag != MKID_BE('SOL\0')) {
+	if (tag != MKTAG('S','O','L',0)) {
 		warning("No 'SOL' FourCC found");
 		return false;
 	}
@@ -290,17 +290,17 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
 		Common::SeekableReadStream *compressedStream = new Common::MemoryReadStream(compressedData, audioRes->size, DisposeAfterUse::YES);
 		
 		switch (audioCompressionType) {
-		case MKID_BE('MP3 '):
+		case MKTAG('M','P','3',' '):
 #ifdef USE_MAD
 			audioSeekStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
 #endif
 			break;
-		case MKID_BE('OGG '):
+		case MKTAG('O','G','G',' '):
 #ifdef USE_VORBIS
 			audioSeekStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
 #endif
 			break;
-		case MKID_BE('FLAC'):
+		case MKTAG('F','L','A','C'):
 #ifdef USE_FLAC
 			audioSeekStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
 #endif
@@ -319,7 +319,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
 				Common::MemoryReadStream dataStream(audioRes->data, audioRes->size, DisposeAfterUse::NO);
 				data = readSOLAudio(&dataStream, size, audioFlags, flags);
 			}
-		} else if (audioRes->size > 4 && READ_BE_UINT32(audioRes->data) == MKID_BE('RIFF')) {
+		} else if (audioRes->size > 4 && READ_BE_UINT32(audioRes->data) == MKTAG('R','I','F','F')) {
 			// WAVE detected
 			Common::SeekableReadStream *waveStream = new Common::MemoryReadStream(audioRes->data, audioRes->size, DisposeAfterUse::NO);
 
@@ -331,7 +331,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
 
 			waveStream->seek(0, SEEK_SET);
 			audioStream = Audio::makeWAVStream(waveStream, DisposeAfterUse::YES);
-		} else if (audioRes->size > 4 && READ_BE_UINT32(audioRes->data) == MKID_BE('FORM')) {
+		} else if (audioRes->size > 4 && READ_BE_UINT32(audioRes->data) == MKTAG('F','O','R','M')) {
 			// AIFF detected
 			Common::SeekableReadStream *waveStream = new Common::MemoryReadStream(audioRes->data, audioRes->size, DisposeAfterUse::NO);