[Scummvm-cvs-logs] CVS: scummvm sound.cpp,1.82,1.83

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv32481

Modified Files:
	sound.cpp 
Log Message:
Big endian fixes

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- sound.cpp	7 May 2002 11:48:34 -0000	1.82
+++ sound.cpp	8 May 2002 20:50:07 -0000	1.83
@@ -693,7 +693,7 @@
 	int num = fileReadDwordBE(_sfxFile);
 	fileReadDwordBE(_sfxFile);	 fileReadDwordBE(_sfxFile);
 	
-	if (tag != MKID_BE('COMP')) {
+	if (tag != MKID('COMP')) {
 		warning("Compressed sound %d invalid (%c%c%c%c)", index, tag>>24, tag>>16, tag>>8, tag);
 		return;
 	}
@@ -764,27 +764,27 @@
 		byte *ptr = CompFinal;
 		int tag, size;
 		tag = READ_BE_UINT32(ptr); ptr+=4;
-		if (tag != MKID_BE('iMUS')) {
+		if (tag != MKID('iMUS')) {
 			warning("Decompression of bundle sound failed");
 			free(CompFinal);
 			return;
 		}
 
 		ptr+=12;       /* Skip header */
-		while(tag != MKID_BE('DATA')) {			
+		while(tag != MKID('DATA')) {
 			tag = READ_BE_UINT32(ptr);  ptr+=4;
 			switch(tag) {
-				case MKID_BE('FRMT'): 
+				case MKID('FRMT'):
 					size = READ_BE_UINT32(ptr); ptr+=16;					
 					rate = READ_BE_UINT32(ptr); ptr+=8;
 				break;
-				case MKID_BE('TEXT'):
-				case MKID_BE('REGN'):
-				case MKID_BE('STOP'):
+				case MKID('TEXT'):
+				case MKID('REGN'):
+				case MKID('STOP'):
 					size = READ_BE_UINT32(ptr); ptr+=size+4;
 				break;
 
-				case MKID_BE('DATA'):
+				case MKID('DATA'):
 					size = READ_BE_UINT32(ptr); ptr+=4;
 				break;