diff options
| author | Max Horn | 2006-02-25 02:12:58 +0000 |
|---|---|---|
| committer | Max Horn | 2006-02-25 02:12:58 +0000 |
| commit | 6914121f6128092985a99a3d3af485f3bed265c3 (patch) | |
| tree | 9c86166ac8a21b6745ab1cdbf389b0eb87d9d160 /engines/scumm/imuse | |
| parent | 6931478e9180a23f9da02790ed2dd3ff503d3b2e (diff) | |
| download | scummvm-rg350-6914121f6128092985a99a3d3af485f3bed265c3.tar.gz scummvm-rg350-6914121f6128092985a99a3d3af485f3bed265c3.tar.bz2 scummvm-rg350-6914121f6128092985a99a3d3af485f3bed265c3.zip | |
Replaced MKID by MID_BE in most places in the SCUMM engine
svn-id: r20862
Diffstat (limited to 'engines/scumm/imuse')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 41e4a1aa96..ba17867905 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -120,22 +120,22 @@ bool IMuseInternal::isMT32(int sound) { if (ptr == NULL) return false; - tag = *(((uint32 *)ptr) + 1); + tag = READ_BE_UINT32(ptr + 4); switch (tag) { - case MKID('ADL '): - case MKID('ASFX'): // Special AD class for old Adlib sound effects - case MKID('SPK '): + case MKID_BE('ADL '): + case MKID_BE('ASFX'): // Special AD class for old Adlib sound effects + case MKID_BE('SPK '): return false; - case MKID('AMI '): - case MKID('ROL '): + case MKID_BE('AMI '): + case MKID_BE('ROL '): return true; - case MKID('MAC '): // Occurs in the Mac version of FOA and MI2 + case MKID_BE('MAC '): // Occurs in the Mac version of FOA and MI2 return true; - case MKID('GMD '): - case MKID('MIDI'): // Occurs in Sam & Max + case MKID_BE('GMD '): + case MKID_BE('MIDI'): // Occurs in Sam & Max return false; } @@ -161,22 +161,22 @@ bool IMuseInternal::isMIDI(int sound) { if (ptr == NULL) return false; - tag = *(((uint32 *)ptr) + 1); + tag = READ_BE_UINT32(ptr + 4); switch (tag) { - case MKID('ADL '): - case MKID('ASFX'): // Special AD class for old Adlib sound effects - case MKID('SPK '): + case MKID_BE('ADL '): + case MKID_BE('ASFX'): // Special AD class for old Adlib sound effects + case MKID_BE('SPK '): return false; - case MKID('AMI '): - case MKID('ROL '): + case MKID_BE('AMI '): + case MKID_BE('ROL '): return true; - case MKID('MAC '): // Occurs in the Mac version of FOA and MI2 + case MKID_BE('MAC '): // Occurs in the Mac version of FOA and MI2 return true; - case MKID('GMD '): - case MKID('MIDI'): // Occurs in Sam & Max + case MKID_BE('GMD '): + case MKID_BE('MIDI'): // Occurs in Sam & Max return true; } |