thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added the 'MKID' macro the the ids to make big endian people happy.

Browse source 
svn-id: r4199
This commit is contained in:
Lionel Ulmer 2002-05-05 07:52:17 +00:00
parent 9f699a21a1
commit 4c605357cf
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
sound.cpp
View file

@ -693,7 +693,7 @@ void Scumm::decompressBundleSound(int index) {
int num = fileReadDwordBE(_sfxFile); int num = fileReadDwordBE(_sfxFile);
fileReadDwordBE(_sfxFile); 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); warning("Compressed sound %d invalid (%c%c%c%c)", index, tag>>24, tag>>16, tag>>8, tag);
return; return;
} }
@ -763,24 +763,24 @@ void Scumm::decompressBundleSound(int index) {
byte *ptr = CompFinal; byte *ptr = CompFinal;
int tag, size; int tag, size;
tag = READ_BE_UINT32(ptr); ptr+=4; tag = READ_BE_UINT32(ptr); ptr+=4;
if (tag != 'iMUS') { if (tag != MKID('iMUS')) {
warning("Decompression of bundle sound failed"); warning("Decompression of bundle sound failed");
free(CompFinal); free(CompFinal);
return; return;
} }
ptr+=12; /* Skip header */ ptr+=12; /* Skip header */
while(tag != 'DATA') { while(tag != MKID('DATA')) {
tag = READ_BE_UINT32(ptr); ptr+=4; tag = READ_BE_UINT32(ptr); ptr+=4;
switch(tag) { switch(tag) {
case 'FRMT': case MKID('FRMT'):
case 'TEXT': case MKID('TEXT'):
case 'REGN': case MKID('REGN'):
case 'STOP': case MKID('STOP'):
size = READ_BE_UINT32(ptr); ptr+=size+4; size = READ_BE_UINT32(ptr); ptr+=size+4;
break; break;
case 'DATA': case MKID('DATA'):
size = READ_BE_UINT32(ptr); ptr+=4; size = READ_BE_UINT32(ptr); ptr+=4;
break; break;