[Scummvm-cvs-logs] CVS: scummvm sound.cpp,1.76,1.77
Lionel Ulmer
bbrox at users.sourceforge.net
Sun May 5 00:53:02 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv12795
Modified Files:
sound.cpp
Log Message:
Added the 'MKID' macro the the ids to make big endian people happy.
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- sound.cpp 5 May 2002 02:28:35 -0000 1.76
+++ sound.cpp 5 May 2002 07:52:17 -0000 1.77
@@ -693,7 +693,7 @@
int num = fileReadDwordBE(_sfxFile);
fileReadDwordBE(_sfxFile); fileReadDwordBE(_sfxFile);
- if (tag != 'COMP') {
+ if (tag != MKID('COMP')) {
warning("Compressed sound %d invalid (%c%c%c%c)", index, tag>>24, tag>>16, tag>>8, tag);
return;
}
@@ -763,25 +763,25 @@
byte *ptr = CompFinal;
int tag, size;
tag = READ_BE_UINT32(ptr); ptr+=4;
- if (tag != 'iMUS') {
+ if (tag != MKID('iMUS')) {
warning("Decompression of bundle sound failed");
free(CompFinal);
return;
}
ptr+=12; /* Skip header */
- while(tag != 'DATA') {
+ while(tag != MKID('DATA')) {
tag = READ_BE_UINT32(ptr); ptr+=4;
switch(tag) {
- case 'FRMT':
- case 'TEXT':
- case 'REGN':
- case 'STOP':
- size = READ_BE_UINT32(ptr); ptr+=size+4;
+ case MKID('FRMT'):
+ case MKID('TEXT'):
+ case MKID('REGN'):
+ case MKID('STOP'):
+ size = READ_BE_UINT32(ptr); ptr+=size+4;
break;
- case 'DATA':
- size = READ_BE_UINT32(ptr); ptr+=4;
+ case MKID('DATA'):
+ size = READ_BE_UINT32(ptr); ptr+=4;
break;
default:
More information about the Scummvm-git-logs
mailing list