diff options
| -rw-r--r-- | sound.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -693,7 +693,7 @@ void Scumm::decompressBundleSound(int index) { 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 @@ void Scumm::decompressBundleSound(int index) { 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: |