Replaced MKID by MID_BE in most places in the SCUMM engine

svn-id: r20862

1 files changed, 23 insertions, 23 deletions

diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index f8b737c5ef..1c972fa299 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -237,7 +237,7 @@ void ScummEngine::loadRoomSubBlocks() {
 	//
 	// Determine the room dimensions (width/height)
 	//
-	rmhd = (const RoomHeader *)findResourceData(MKID('RMHD'), roomptr);
+	rmhd = (const RoomHeader *)findResourceData(MKID_BE('RMHD'), roomptr);
 
 	if (_game.version == 8) {
 		_roomWidth = READ_LE_UINT32(&(rmhd->v8.width));
@@ -259,18 +259,18 @@ void ScummEngine::loadRoomSubBlocks() {
 	if (_game.version == 8) {
 		_IM00_offs = getObjectImage(roomptr, 1) - roomptr;
 	} else if (_game.features & GF_SMALL_HEADER) {
-		_IM00_offs = findResourceData(MKID('IM00'), roomptr) - roomptr;
+		_IM00_offs = findResourceData(MKID_BE('IM00'), roomptr) - roomptr;
 	} else if (_game.heversion >= 70) {
 		byte *roomImagePtr = getResourceAddress(rtRoomImage, _roomResource);
-		_IM00_offs = findResource(MKID('IM00'), roomImagePtr) - roomImagePtr;
+		_IM00_offs = findResource(MKID_BE('IM00'), roomImagePtr) - roomImagePtr;
 	} else {
-		_IM00_offs = findResource(MKID('IM00'), findResource(MKID('RMIM'), roomptr)) - roomptr;
+		_IM00_offs = findResource(MKID_BE('IM00'), findResource(MKID_BE('RMIM'), roomptr)) - roomptr;
 	}
 
 	//
 	// Look for an exit script
 	//
-	ptr = findResourceData(MKID('EXCD'), roomResPtr);
+	ptr = findResourceData(MKID_BE('EXCD'), roomResPtr);
 	if (ptr)
 		_EXCD_offs = ptr - roomResPtr;
 	if (_dumpScripts && _EXCD_offs)
@@ -279,7 +279,7 @@ void ScummEngine::loadRoomSubBlocks() {
 	//
 	// Look for an entry script
 	//
-	ptr = findResourceData(MKID('ENCD'), roomResPtr);
+	ptr = findResourceData(MKID_BE('ENCD'), roomResPtr);
 	if (ptr)
 		_ENCD_offs = ptr - roomResPtr;
 	if (_dumpScripts && _ENCD_offs)
@@ -299,7 +299,7 @@ void ScummEngine::loadRoomSubBlocks() {
 
 	if (_game.features & GF_SMALL_HEADER) {
 		ResourceIterator localScriptIterator(searchptr, true);
-		while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
+		while ((ptr = localScriptIterator.findNext(MKID_BE('LSCR'))) != NULL) {
 			int id = 0;
 			ptr += _resourceHeaderSize;	/* skip tag & size */
 			id = ptr[0];
@@ -314,7 +314,7 @@ void ScummEngine::loadRoomSubBlocks() {
 		}
 	} else if (_game.heversion >= 90) {
 		ResourceIterator localScriptIterator2(searchptr, false);
-		while ((ptr = localScriptIterator2.findNext(MKID('LSC2'))) != NULL) {
+		while ((ptr = localScriptIterator2.findNext(MKID_BE('LSC2'))) != NULL) {
 			int id = 0;
 
 			ptr += _resourceHeaderSize;	/* skip tag & size */
@@ -332,7 +332,7 @@ void ScummEngine::loadRoomSubBlocks() {
 		}
 
 		ResourceIterator localScriptIterator(searchptr, false);
-		while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
+		while ((ptr = localScriptIterator.findNext(MKID_BE('LSCR'))) != NULL) {
 			int id = 0;
 
 			ptr += _resourceHeaderSize;	/* skip tag & size */
@@ -349,7 +349,7 @@ void ScummEngine::loadRoomSubBlocks() {
 
 	} else {
 		ResourceIterator localScriptIterator(searchptr, false);
-		while ((ptr = localScriptIterator.findNext(MKID('LSCR'))) != NULL) {
+		while ((ptr = localScriptIterator.findNext(MKID_BE('LSCR'))) != NULL) {
 			int id = 0;
 
 			ptr += _resourceHeaderSize;	/* skip tag & size */
@@ -376,18 +376,18 @@ void ScummEngine::loadRoomSubBlocks() {
 	}
 
 	// Locate the EGA palette (currently unused).
-	ptr = findResourceData(MKID('EPAL'), roomptr);
+	ptr = findResourceData(MKID_BE('EPAL'), roomptr);
 	if (ptr)
 		_EPAL_offs = ptr - roomptr;
 
 	// Locate the standard room palette (for V3-V5 games).
-	ptr = findResourceData(MKID('CLUT'), roomptr);
+	ptr = findResourceData(MKID_BE('CLUT'), roomptr);
 	if (ptr)
 		_CLUT_offs = ptr - roomptr;
 
 	// Locate the standard room palettes (for V6+ games).
 	if (_game.version >= 6) {
-		ptr = findResource(MKID('PALS'), roomptr);
+		ptr = findResource(MKID_BE('PALS'), roomptr);
 		if (ptr) {
 			_PALS_offs = ptr - roomptr;
 		}
@@ -398,7 +398,7 @@ void ScummEngine::loadRoomSubBlocks() {
 	if (_game.version == 8)
 		trans = (byte)READ_LE_UINT32(&(rmhd->v8.transparency));
 	else {
-		ptr = findResourceData(MKID('TRNS'), roomptr);
+		ptr = findResourceData(MKID_BE('TRNS'), roomptr);
 		if (ptr)
 			trans = ptr[0];
 		else
@@ -407,7 +407,7 @@ void ScummEngine::loadRoomSubBlocks() {
 
 	// Actor Palette in HE 70 games
 	if (_game.heversion == 70) {
-		ptr = findResourceData(MKID('REMP'), roomptr);
+		ptr = findResourceData(MKID_BE('REMP'), roomptr);
 		if (ptr) {
 			for (i = 0; i < 256; i++)
 				_HEV7ActorPalette[i] = *ptr++;
@@ -457,7 +457,7 @@ void ScummEngine::initRoomSubBlocks() {
 	res.nukeResource(rtMatrix, 1);
 	res.nukeResource(rtMatrix, 2);
 	if (_game.features & GF_SMALL_HEADER) {
-		ptr = findResourceData(MKID('BOXD'), roomptr);
+		ptr = findResourceData(MKID_BE('BOXD'), roomptr);
 		if (ptr) {
 			byte numOfBoxes = *ptr;
 			int size;
@@ -478,21 +478,21 @@ void ScummEngine::initRoomSubBlocks() {
 
 		}
 	} else {
-		ptr = findResourceData(MKID('BOXD'), roomptr);
+		ptr = findResourceData(MKID_BE('BOXD'), roomptr);
 		if (ptr) {
 			int size = getResourceDataSize(ptr);
 			res.createResource(rtMatrix, 2, size);
 			roomptr = getResourceAddress(rtRoom, _roomResource);
-			ptr = findResourceData(MKID('BOXD'), roomptr);
+			ptr = findResourceData(MKID_BE('BOXD'), roomptr);
 			memcpy(getResourceAddress(rtMatrix, 2), ptr, size);
 		}
 
-		ptr = findResourceData(MKID('BOXM'), roomptr);
+		ptr = findResourceData(MKID_BE('BOXM'), roomptr);
 		if (ptr) {
 			int size = getResourceDataSize(ptr);
 			res.createResource(rtMatrix, 1, size);
 			roomptr = getResourceAddress(rtRoom, _roomResource);
-			ptr = findResourceData(MKID('BOXM'), roomptr);
+			ptr = findResourceData(MKID_BE('BOXM'), roomptr);
 			memcpy(getResourceAddress(rtMatrix, 1), ptr, size);
 		}
 	}
@@ -503,7 +503,7 @@ void ScummEngine::initRoomSubBlocks() {
 	for (i = 1; i < res.num[rtScaleTable]; i++)
 		res.nukeResource(rtScaleTable, i);
 
-	ptr = findResourceData(MKID('SCAL'), roomptr);
+	ptr = findResourceData(MKID_BE('SCAL'), roomptr);
 	if (ptr) {
 		int s1, s2, y1, y2;
 		if (_game.version == 8) {
@@ -530,7 +530,7 @@ void ScummEngine::initRoomSubBlocks() {
 	// Color cycling
 	// HE 7.0 games load resources but don't use them.
 	if (_game.version >= 4 && _game.heversion <= 61) {
-		ptr = findResourceData(MKID('CYCL'), roomptr);
+		ptr = findResourceData(MKID_BE('CYCL'), roomptr);
 		if (ptr) {
 			initCycl(ptr);
 		}
@@ -539,7 +539,7 @@ void ScummEngine::initRoomSubBlocks() {
 #ifndef DISABLE_HE
 	// Polygons in HE 80+ games
 	if (_game.heversion >= 80) {
-		ptr = findResourceData(MKID('POLD'), roomptr);
+		ptr = findResourceData(MKID_BE('POLD'), roomptr);
 		if (ptr) {
 			((ScummEngine_v70he *)this)->_wiz->polygonLoad(ptr);
 		}