aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuediger Hanke2002-05-08 20:50:07 +0000
committerRuediger Hanke2002-05-08 20:50:07 +0000
commit9687c6062187d2752f1b418838017b9fe55ba22e (patch)
tree2c4ecfa64d072bdc708242ec7baacfc83ded711b
parent154e4b375e84fe8e1254de3ebda03d56e112231d (diff)
downloadscummvm-rg350-9687c6062187d2752f1b418838017b9fe55ba22e.tar.gz
scummvm-rg350-9687c6062187d2752f1b418838017b9fe55ba22e.tar.bz2
scummvm-rg350-9687c6062187d2752f1b418838017b9fe55ba22e.zip
Big endian fixes
svn-id: r4249
-rw-r--r--sound.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound.cpp b/sound.cpp
index 3c2316f8b7..5676befeea 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_BE('COMP')) {
+ if (tag != MKID('COMP')) {
warning("Compressed sound %d invalid (%c%c%c%c)", index, tag>>24, tag>>16, tag>>8, tag);
return;
}
@@ -764,27 +764,27 @@ void Scumm::decompressBundleSound(int index) {
byte *ptr = CompFinal;
int tag, size;
tag = READ_BE_UINT32(ptr); ptr+=4;
- if (tag != MKID_BE('iMUS')) {
+ if (tag != MKID('iMUS')) {
warning("Decompression of bundle sound failed");
free(CompFinal);
return;
}
ptr+=12; /* Skip header */
- while(tag != MKID_BE('DATA')) {
+ while(tag != MKID('DATA')) {
tag = READ_BE_UINT32(ptr); ptr+=4;
switch(tag) {
- case MKID_BE('FRMT'):
+ case MKID('FRMT'):
size = READ_BE_UINT32(ptr); ptr+=16;
rate = READ_BE_UINT32(ptr); ptr+=8;
break;
- case MKID_BE('TEXT'):
- case MKID_BE('REGN'):
- case MKID_BE('STOP'):
+ case MKID('TEXT'):
+ case MKID('REGN'):
+ case MKID('STOP'):
size = READ_BE_UINT32(ptr); ptr+=size+4;
break;
- case MKID_BE('DATA'):
+ case MKID('DATA'):
size = READ_BE_UINT32(ptr); ptr+=4;
break;