aboutsummaryrefslogtreecommitdiff
path: root/sound.cpp
diff options
context:
space:
mode:
authorJames Brown2002-05-05 17:44:39 +0000
committerJames Brown2002-05-05 17:44:39 +0000
commit46f7c4d543fb335a85041747cf489621e451a58d (patch)
treeb62fccc7a75910349d4c504737fab496dccff55e /sound.cpp
parent59374705586d137fe6b847f4af4e972b02c35fbe (diff)
downloadscummvm-rg350-46f7c4d543fb335a85041747cf489621e451a58d.tar.gz
scummvm-rg350-46f7c4d543fb335a85041747cf489621e451a58d.tar.bz2
scummvm-rg350-46f7c4d543fb335a85041747cf489621e451a58d.zip
Add more Dig compatability, fix Dig sounds due to Endian.
svn-id: r4201
Diffstat (limited to 'sound.cpp')
-rw-r--r--sound.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound.cpp b/sound.cpp
index b085bf6516..849a5b1db9 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 != MKID('COMP')) {
+ if (tag != MKID_BE('COMP')) {
warning("Compressed sound %d invalid (%c%c%c%c)", index, tag>>24, tag>>16, tag>>8, tag);
return;
}
@@ -763,24 +763,24 @@ void Scumm::decompressBundleSound(int index) {
byte *ptr = CompFinal;
int tag, size;
tag = READ_BE_UINT32(ptr); ptr+=4;
- if (tag != MKID('iMUS')) {
+ if (tag != MKID_BE('iMUS')) {
warning("Decompression of bundle sound failed");
free(CompFinal);
return;
}
ptr+=12; /* Skip header */
- while(tag != MKID('DATA')) {
+ while(tag != MKID_BE('DATA')) {
tag = READ_BE_UINT32(ptr); ptr+=4;
switch(tag) {
- case MKID('FRMT'):
- case MKID('TEXT'):
- case MKID('REGN'):
- case MKID('STOP'):
+ case MKID_BE('FRMT'):
+ case MKID_BE('TEXT'):
+ case MKID_BE('REGN'):
+ case MKID_BE('STOP'):
size = READ_BE_UINT32(ptr); ptr+=size+4;
break;
- case MKID('DATA'):
+ case MKID_BE('DATA'):
size = READ_BE_UINT32(ptr); ptr+=4;
break;