diff options
| author | Max Horn | 2011-05-11 18:06:30 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-13 11:47:10 +0200 |
| commit | 75b9deb1856bae8355403faa5f55857f3929adb6 (patch) | |
| tree | e3a12b77289bd2f5cc3a252a9867974a2d1cb965 /engines/scumm/imuse | |
| parent | 0af2f71c71e39df2d61dd7cc9faed7c5e6a50fab (diff) | |
| download | scummvm-rg350-75b9deb1856bae8355403faa5f55857f3929adb6.tar.gz scummvm-rg350-75b9deb1856bae8355403faa5f55857f3929adb6.tar.bz2 scummvm-rg350-75b9deb1856bae8355403faa5f55857f3929adb6.zip | |
SCUMM: Get rid of the MemBlkHeader hack
This uncovered at least one potentially serious bug in the inventory
code, which still needs to be investigated and fixed.
Diffstat (limited to 'engines/scumm/imuse')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index e6b134a7d8..4a7ddd05fc 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -112,12 +112,12 @@ byte *IMuseInternal::findStartOfSound(int sound) { } // Check for old-style headers first, like 'RO' - if (ptr[4] == 'R' && ptr[5] == 'O'&& ptr[6] != 'L') + if (ptr[0] == 'R' && ptr[1] == 'O'&& ptr[2] != 'L') + return ptr; + if (ptr[4] == 'S' && ptr[5] == 'O') return ptr + 4; - if (ptr[8] == 'S' && ptr[9] == 'O') - return ptr + 8; - ptr += 8; + ptr += 4; size = READ_BE_UINT32(ptr); ptr += 4; @@ -145,7 +145,7 @@ bool IMuseInternal::isMT32(int sound) { if (ptr == NULL) return false; - tag = READ_BE_UINT32(ptr + 4); + tag = READ_BE_UINT32(ptr); switch (tag) { case MKTAG('A','D','L',' '): case MKTAG('A','S','F','X'): // Special AD class for old AdLib sound effects @@ -164,17 +164,17 @@ bool IMuseInternal::isMT32(int sound) { case MKTAG('M','I','D','I'): // Occurs in Sam & Max // HE games use Roland music - if (ptr[12] == 'H' && ptr[13] == 'S') + if (ptr[8] == 'H' && ptr[9] == 'S') return true; else return false; } // Old style 'RO' has equivalent properties to 'ROL' - if (ptr[4] == 'R' && ptr[5] == 'O') + if (ptr[0] == 'R' && ptr[1] == 'O') return true; // Euphony tracks show as 'SO' and have equivalent properties to 'ADL' - if (ptr[8] == 'S' && ptr[9] == 'O') + if (ptr[4] == 'S' && ptr[5] == 'O') return false; error("Unknown music type: '%c%c%c%c'", (char)tag >> 24, (char)tag >> 16, (char)tag >> 8, (char)tag); @@ -192,7 +192,7 @@ bool IMuseInternal::isMIDI(int sound) { if (ptr == NULL) return false; - tag = READ_BE_UINT32(ptr + 4); + tag = READ_BE_UINT32(ptr); switch (tag) { case MKTAG('A','D','L',' '): case MKTAG('A','S','F','X'): // Special AD class for old AdLib sound effects @@ -212,11 +212,11 @@ bool IMuseInternal::isMIDI(int sound) { } // Old style 'RO' has equivalent properties to 'ROL' - if (ptr[4] == 'R' && ptr[5] == 'O') + if (ptr[0] == 'R' && ptr[1] == 'O') return true; // Euphony tracks show as 'SO' and have equivalent properties to 'ADL' // FIXME: Right now we're pretending it's GM. - if (ptr[8] == 'S' && ptr[9] == 'O') + if (ptr[4] == 'S' && ptr[5] == 'O') return true; error("Unknown music type: '%c%c%c%c'", (char)tag >> 24, (char)tag >> 16, (char)tag >> 8, (char)tag); |