aboutsummaryrefslogtreecommitdiff
path: root/sound.cpp
diff options
context:
space:
mode:
authorLionel Ulmer2002-05-05 07:52:17 +0000
committerLionel Ulmer2002-05-05 07:52:17 +0000
commit4c605357cf58e9b088e830300199e4898b8212cc (patch)
treecb06b5242e17c33cabcb5b13c59f4490dff71934 /sound.cpp
parent9f699a21a131b50042144d3fb93a29baaf942d6c (diff)
downloadscummvm-rg350-4c605357cf58e9b088e830300199e4898b8212cc.tar.gz
scummvm-rg350-4c605357cf58e9b088e830300199e4898b8212cc.tar.bz2
scummvm-rg350-4c605357cf58e9b088e830300199e4898b8212cc.zip
Added the 'MKID' macro the the ids to make big endian people happy.
svn-id: r4199
Diffstat (limited to 'sound.cpp')
-rw-r--r--sound.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound.cpp b/sound.cpp
index a1cee8e314..b085bf6516 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -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: